Snap for 5470312 from e5c4d62ba3fca09fed86ec605542b2be74a59851 to qt-release (7bf22480) · Commits · e / os / android_system_core

debuggerd/crash_dump.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@
		#define ATRACE_TAG ATRACE_TAG_BIONIC
		#include <utils/Trace.h>

		#include <unwindstack/DexFiles.h>
		#include <unwindstack/JitDebug.h>
		#include <unwindstack/Maps.h>
		#include <unwindstack/Memory.h>
		@@ -566,7 +567,7 @@ int main(int argc, char** argv) {

		// TODO: Use seccomp to lock ourselves down.
		unwindstack::UnwinderFromPid unwinder(256, vm_pid);
		if (!unwinder.Init()) {
		if (!unwinder.Init(unwindstack::Regs::CurrentArch())) {
		LOG(FATAL) << "Failed to init unwinder object.";
		}

debuggerd/handler/debuggerd_fallback.cpp

+4 −3

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@
		#include <android-base/file.h>
		#include <android-base/unique_fd.h>
		#include <async_safe/log.h>
		#include <unwindstack/DexFiles.h>
		#include <unwindstack/JitDebug.h>
		#include <unwindstack/Maps.h>
		#include <unwindstack/Memory.h>
		@@ -80,12 +81,12 @@ static void debuggerd_fallback_trace(int output_fd, ucontext_t* ucontext) {
		thread.pid = getpid();
		thread.tid = gettid();
		thread.thread_name = get_thread_name(gettid());
		thread.registers.reset(
		unwindstack::Regs::CreateFromUcontext(unwindstack::Regs::CurrentArch(), ucontext));
		unwindstack::ArchEnum arch = unwindstack::Regs::CurrentArch();
		thread.registers.reset(unwindstack::Regs::CreateFromUcontext(arch, ucontext));

		// TODO: Create this once and store it in a global?
		unwindstack::UnwinderFromPid unwinder(kMaxFrames, getpid());
		if (unwinder.Init()) {
		if (unwinder.Init(arch)) {
		dump_backtrace_thread(output_fd, &unwinder, thread);
		} else {
		async_safe_format_log(ANDROID_LOG_ERROR, "libc", "Unable to init unwinder.");

debuggerd/libdebuggerd/tombstone.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -45,6 +45,7 @@
		#include <log/log.h>
		#include <log/logprint.h>
		#include <private/android_filesystem_config.h>
		#include <unwindstack/DexFiles.h>
		#include <unwindstack/JitDebug.h>
		#include <unwindstack/Maps.h>
		#include <unwindstack/Memory.h>
		@@ -650,7 +651,7 @@ void engrave_tombstone_ucontext(int tombstone_fd, uint64_t abort_msg_address, si
		};

		unwindstack::UnwinderFromPid unwinder(kMaxFrames, pid);
		if (!unwinder.Init()) {
		if (!unwinder.Init(unwindstack::Regs::CurrentArch())) {
		LOG(FATAL) << "Failed to init unwinder object.";
		}

init/first_stage_mount.cpp

+33 −20

Original line number	Diff line number	Diff line
		@@ -80,7 +80,7 @@ class FirstStageMount {
		bool InitMappedDevice(const std::string& verity_device);
		bool InitDeviceMapper();
		bool CreateLogicalPartitions();
		bool MountPartition(const Fstab::iterator& begin, bool erase_used_fstab_entry,
		bool MountPartition(const Fstab::iterator& begin, bool erase_same_mounts,
		Fstab::iterator* end = nullptr);

		bool MountPartitions();
		@@ -437,21 +437,26 @@ bool FirstStageMount::InitMappedDevice(const std::string& dm_device) {

		uevent_listener_.RegenerateUeventsForPath(syspath, verity_callback);
		if (!found) {
		LOG(INFO) << "dm-verity device not found in /sys, waiting for its uevent";
		LOG(INFO) << "dm device '" << dm_device << "' not found in /sys, waiting for its uevent";
		Timer t;
		uevent_listener_.Poll(verity_callback, 10s);
		LOG(INFO) << "wait for dm-verity device returned after " << t;
		LOG(INFO) << "wait for dm device '" << dm_device << "' returned after " << t;
		}
		if (!found) {
		LOG(ERROR) << "dm-verity device not found after polling timeout";
		LOG(ERROR) << "dm device '" << dm_device << "' not found after polling timeout";
		return false;
		}

		return true;
		}

		bool FirstStageMount::MountPartition(const Fstab::iterator& begin, bool erase_used_fstab_entry,
		bool FirstStageMount::MountPartition(const Fstab::iterator& begin, bool erase_same_mounts,
		Fstab::iterator* end) {
		// Sets end to begin + 1, so we can just return on failure below.
		if (end) {
		*end = begin + 1;
		}

		if (begin->fs_mgr_flags.logical) {
		if (!fs_mgr_update_logical_partition(&(*begin))) {
		return false;
		@@ -477,7 +482,7 @@ bool FirstStageMount::MountPartition(const Fstab::iterator& begin, bool erase_us
		mounted = (fs_mgr_do_mount_one(*current) == 0);
		}
		}
		if (erase_used_fstab_entry) {
		if (erase_same_mounts) {
		current = fstab_.erase(begin, current);
		}
		if (end) {
		@@ -494,7 +499,7 @@ bool FirstStageMount::TrySwitchSystemAsRoot() {
		return entry.mount_point == "/metadata";
		});
		if (metadata_partition != fstab_.end()) {
		if (MountPartition(metadata_partition, true /* erase_used_fstab_entry */)) {
		if (MountPartition(metadata_partition, true /* erase_same_mounts */)) {
		UseGsiIfPresent();
		}
		}
		@@ -505,7 +510,7 @@ bool FirstStageMount::TrySwitchSystemAsRoot() {

		if (system_partition == fstab_.end()) return true;

		if (MountPartition(system_partition, false)) {
		if (MountPartition(system_partition, false /* erase_same_mounts */)) {
		if (gsi_not_on_userdata_ && fs_mgr_verity_is_check_at_most_once(*system_partition)) {
		LOG(ERROR) << "check_most_at_once forbidden on external media";
		return false;
		@@ -560,7 +565,7 @@ bool FirstStageMount::MountPartitions() {
		}

		Fstab::iterator end;
		if (!MountPartition(current, false, &end)) {
		if (!MountPartition(current, false /* erase_same_mounts */, &end)) {
		if (current->fs_mgr_flags.no_fail) {
		LOG(INFO) << "Failed to mount " << current->mount_point
		<< ", ignoring mount for no_fail partition";
		@@ -797,11 +802,9 @@ bool FirstStageMountVBootV2::GetDmVerityDevices() {
		bool FirstStageMountVBootV2::SetUpDmVerity(FstabEntry* fstab_entry) {
		AvbHashtreeResult hashtree_result;

		if (fstab_entry->fs_mgr_flags.avb) {
		if (!InitAvbHandle()) return false;
		hashtree_result =
		avb_handle_->SetUpAvbHashtree(fstab_entry, false /* wait_for_verity_dev */);
		} else if (!fstab_entry->avb_keys.empty()) {
		// It's possible for a fstab_entry to have both avb_keys and avb flag.
		// In this case, try avb_keys first, then fallback to avb flag.
		if (!fstab_entry->avb_keys.empty()) {
		if (!InitAvbHandle()) return false;
		// Checks if hashtree should be disabled from the top-level /vbmeta.
		if (avb_handle_->status() == AvbHandleStatus::kHashtreeDisabled \|\|
		@@ -813,14 +816,24 @@ bool FirstStageMountVBootV2::SetUpDmVerity(FstabEntry* fstab_entry) {
		auto avb_standalone_handle = AvbHandle::LoadAndVerifyVbmeta(*fstab_entry);
		if (!avb_standalone_handle) {
		LOG(ERROR) << "Failed to load offline vbmeta for " << fstab_entry->mount_point;
		return false;
		}
		// Fallbacks to built-in hashtree if fs_mgr_flags.avb is set.
		if (!fstab_entry->fs_mgr_flags.avb) return false;
		LOG(INFO) << "Fallback to built-in hashtree for " << fstab_entry->mount_point;
		hashtree_result =
		avb_handle_->SetUpAvbHashtree(fstab_entry, false /* wait_for_verity_dev */);
		} else {
		// Sets up hashtree via the standalone handle.
		if (IsStandaloneImageRollback(avb_handle_, avb_standalone_handle, *fstab_entry)) {
		return false;
		}
		hashtree_result = avb_standalone_handle->SetUpAvbHashtree(
		fstab_entry, false /* wait_for_verity_dev */);
		}
		}
		} else if (fstab_entry->fs_mgr_flags.avb) {
		if (!InitAvbHandle()) return false;
		hashtree_result =
		avb_handle_->SetUpAvbHashtree(fstab_entry, false /* wait_for_verity_dev */);
		} else {
		return true; // No need AVB, returns true to mount the partition directly.
		}

libbacktrace/UnwindStack.cpp

+11 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,9 @@
		#include <unwindstack/Regs.h>
		#include <unwindstack/RegsGetLocal.h>

		#if !defined(NO_LIBDEXFILE_SUPPORT)
		#include <unwindstack/DexFiles.h>
		#endif
		#include <unwindstack/Unwinder.h>

		#include "BacktraceLog.h"
		@@ -47,6 +50,14 @@ bool Backtrace::Unwind(unwindstack::Regs* regs, BacktraceMap* back_map,
		regs, stack_map->process_memory());
		unwinder.SetResolveNames(stack_map->ResolveNames());
		stack_map->SetArch(regs->Arch());
		if (stack_map->GetJitDebug() != nullptr) {
		unwinder.SetJitDebug(stack_map->GetJitDebug(), regs->Arch());
		}
		#if !defined(NO_LIBDEXFILE_SUPPORT)
		if (stack_map->GetDexFiles() != nullptr) {
		unwinder.SetDexFiles(stack_map->GetDexFiles(), regs->Arch());
		}
		#endif
		unwinder.Unwind(skip_names, &stack_map->GetSuffixesToIgnore());
		if (error != nullptr) {
		switch (unwinder.LastErrorCode()) {