01040b10b2
When a shared library is loaded directly from an apk, the new way the linker splits a shared library into a read-only and execute segment broke unwinding. Modify the code to handle this case. Other changes: - Modify the algorithm for finding read-only map entries. Before, the code would search the entire map for the closest offset. Now it simply looks at the previous map. I did this because the old code was too lenient and might still work even if the linker changes. I want this to break if the linker behavior changes so that I can analyze the change. - Update the tools to use PTRACE_SEIZE instead of PTRACE_ATTACH since PTRACE_ATTACH doesn't work in all cases. - Small refactor of the GetFileMemory function. - Add new unit test cases and new offline unwind test cases. Bug: 120618231 Test: Ran new unit tests, ran original failing test. Change-Id: I4bade55cf33220d52f1d5e9b0cbbbcc8419669d4
94 lines
2.7 KiB
C++
94 lines
2.7 KiB
C++
/*
|
|
* Copyright (C) 2016 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifndef _LIBUNWINDSTACK_MAP_INFO_H
|
|
#define _LIBUNWINDSTACK_MAP_INFO_H
|
|
|
|
#include <stdint.h>
|
|
|
|
#include <atomic>
|
|
#include <memory>
|
|
#include <mutex>
|
|
#include <string>
|
|
|
|
#include <unwindstack/Elf.h>
|
|
|
|
namespace unwindstack {
|
|
|
|
// Forward declarations.
|
|
class Maps;
|
|
class Memory;
|
|
|
|
struct MapInfo {
|
|
MapInfo(Maps* maps) : maps_(maps) {}
|
|
MapInfo(Maps* maps, uint64_t start, uint64_t end) : maps_(maps), start(start), end(end) {}
|
|
MapInfo(Maps* maps, uint64_t start, uint64_t end, uint64_t offset, uint64_t flags,
|
|
const char* name)
|
|
: maps_(maps),
|
|
start(start),
|
|
end(end),
|
|
offset(offset),
|
|
flags(flags),
|
|
name(name),
|
|
load_bias(static_cast<uint64_t>(-1)) {}
|
|
MapInfo(Maps* maps, uint64_t start, uint64_t end, uint64_t offset, uint64_t flags,
|
|
const std::string& name)
|
|
: maps_(maps),
|
|
start(start),
|
|
end(end),
|
|
offset(offset),
|
|
flags(flags),
|
|
name(name),
|
|
load_bias(static_cast<uint64_t>(-1)) {}
|
|
~MapInfo() = default;
|
|
|
|
Maps* maps_ = nullptr;
|
|
|
|
uint64_t start = 0;
|
|
uint64_t end = 0;
|
|
uint64_t offset = 0;
|
|
uint16_t flags = 0;
|
|
std::string name;
|
|
std::shared_ptr<Elf> elf;
|
|
// This value is only non-zero if the offset is non-zero but there is
|
|
// no elf signature found at that offset. This indicates that the
|
|
// entire file is represented by the Memory object returned by CreateMemory,
|
|
// instead of a portion of the file.
|
|
uint64_t elf_offset = 0;
|
|
|
|
std::atomic_uint64_t load_bias;
|
|
|
|
// This function guarantees it will never return nullptr.
|
|
Elf* GetElf(const std::shared_ptr<Memory>& process_memory, ArchEnum expected_arch);
|
|
|
|
uint64_t GetLoadBias(const std::shared_ptr<Memory>& process_memory);
|
|
|
|
Memory* CreateMemory(const std::shared_ptr<Memory>& process_memory);
|
|
|
|
private:
|
|
MapInfo(const MapInfo&) = delete;
|
|
void operator=(const MapInfo&) = delete;
|
|
|
|
Memory* GetFileMemory();
|
|
bool InitFileMemoryFromPreviousReadOnlyMap(MemoryFileAtOffset* memory);
|
|
|
|
// Protect the creation of the elf object.
|
|
std::mutex mutex_;
|
|
};
|
|
|
|
} // namespace unwindstack
|
|
|
|
#endif // _LIBUNWINDSTACK_MAP_INFO_H
|