Merge "snapuserd: typecast cow_op->new_block to uint64_t" into main
diff --git a/debuggerd/Android.bp b/debuggerd/Android.bp
index c365cac..3257a2c 100644
--- a/debuggerd/Android.bp
+++ b/debuggerd/Android.bp
@@ -200,22 +200,18 @@
ramdisk_available: true,
recovery_available: true,
vendor_ramdisk_available: true,
+ host_supported: true,
local_include_dirs: ["libdebuggerd/include"],
export_include_dirs: ["libdebuggerd/include"],
srcs: [
"libdebuggerd/tombstone_proto_to_text.cpp",
- ],
-
- header_libs: [
- "bionic_libc_platform_headers",
+ "libdebuggerd/utility_host.cpp",
],
static_libs: [
"libbase",
- "liblog_for_runtime_apex",
- "libunwindstack",
],
whole_static_libs: [
@@ -223,6 +219,10 @@
"libprotobuf-cpp-lite",
],
+ shared_libs: [
+ "liblog",
+ ],
+
apex_available: [
"//apex_available:platform",
"com.android.runtime",
@@ -331,15 +331,18 @@
cc_binary {
name: "pbtombstone",
+ host_supported: true,
defaults: ["debuggerd_defaults"],
- srcs: ["pbtombstone.cpp"],
+ srcs: [
+ "pbtombstone.cpp",
+ "tombstone_symbolize.cpp",
+ ],
static_libs: [
"libbase",
- "libdebuggerd",
+ "libdebuggerd_tombstone_proto_to_text",
"liblog",
"libprotobuf-cpp-lite",
"libtombstone_proto",
- "libunwindstack",
],
}
diff --git a/debuggerd/debuggerd_test.cpp b/debuggerd/debuggerd_test.cpp
index e33cea5..13c8d70 100644
--- a/debuggerd/debuggerd_test.cpp
+++ b/debuggerd/debuggerd_test.cpp
@@ -70,6 +70,7 @@
#include "crash_test.h"
#include "debuggerd/handler.h"
#include "gtest/gtest.h"
+#include "libdebuggerd/utility_host.h"
#include "protocol.h"
#include "tombstoned/tombstoned.h"
#include "util.h"
@@ -741,8 +742,6 @@
}
#if defined(__aarch64__)
-constexpr size_t kTagGranuleSize = 16;
-
static uintptr_t CreateTagMapping() {
// Some of the MTE tag dump tests assert that there is an inaccessible page to the left and right
// of the PROT_MTE page, so map three pages and set the two guard pages to PROT_NONE.
diff --git a/debuggerd/libdebuggerd/include/libdebuggerd/tombstone.h b/debuggerd/libdebuggerd/include/libdebuggerd/tombstone.h
index 074b095..39989c3 100644
--- a/debuggerd/libdebuggerd/include/libdebuggerd/tombstone.h
+++ b/debuggerd/libdebuggerd/include/libdebuggerd/tombstone.h
@@ -67,10 +67,6 @@
const Architecture* guest_arch,
unwindstack::AndroidUnwinder* guest_unwinder);
-bool tombstone_proto_to_text(
- const Tombstone& tombstone,
- std::function<void(const std::string& line, bool should_log)> callback);
-
void fill_in_backtrace_frame(BacktraceFrame* f, const unwindstack::FrameData& frame);
void set_human_readable_cause(Cause* cause, uint64_t fault_addr);
#if defined(__aarch64__)
diff --git a/debuggerd/libdebuggerd/include/libdebuggerd/tombstone_proto_to_text.h b/debuggerd/libdebuggerd/include/libdebuggerd/tombstone_proto_to_text.h
new file mode 100644
index 0000000..2de9723
--- /dev/null
+++ b/debuggerd/libdebuggerd/include/libdebuggerd/tombstone_proto_to_text.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2024 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.
+ */
+
+#pragma once
+
+#include <functional>
+#include <string>
+
+class BacktraceFrame;
+class Tombstone;
+
+bool tombstone_proto_to_text(
+ const Tombstone& tombstone,
+ std::function<void(const std::string& line, bool should_log)> callback,
+ std::function<void(const BacktraceFrame& frame)> symbolize);
diff --git a/debuggerd/libdebuggerd/include/libdebuggerd/utility.h b/debuggerd/libdebuggerd/include/libdebuggerd/utility.h
index 26c2cd4..b86c13d 100644
--- a/debuggerd/libdebuggerd/include/libdebuggerd/utility.h
+++ b/debuggerd/libdebuggerd/include/libdebuggerd/utility.h
@@ -91,10 +91,3 @@
void get_signal_sender(char* buf, size_t n, const siginfo_t*);
const char* get_signame(const siginfo_t*);
const char* get_sigcode(const siginfo_t*);
-
-// Number of bytes per MTE granule.
-constexpr size_t kTagGranuleSize = 16;
-
-// Number of rows and columns to display in an MTE tag dump.
-constexpr size_t kNumTagColumns = 16;
-constexpr size_t kNumTagRows = 16;
diff --git a/debuggerd/libdebuggerd/include/libdebuggerd/utility_host.h b/debuggerd/libdebuggerd/include/libdebuggerd/utility_host.h
new file mode 100644
index 0000000..43fb8bd
--- /dev/null
+++ b/debuggerd/libdebuggerd/include/libdebuggerd/utility_host.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2024, 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.
+ */
+
+#pragma once
+
+#include <string>
+
+#include <stddef.h>
+
+std::string describe_tagged_addr_ctrl(long ctrl);
+std::string describe_pac_enabled_keys(long keys);
+
+// Number of bytes per MTE granule.
+constexpr size_t kTagGranuleSize = 16;
+
+// Number of rows and columns to display in an MTE tag dump.
+constexpr size_t kNumTagColumns = 16;
+constexpr size_t kNumTagRows = 16;
diff --git a/debuggerd/libdebuggerd/scudo.cpp b/debuggerd/libdebuggerd/scudo.cpp
index 4ee87c8..71d5fcf 100644
--- a/debuggerd/libdebuggerd/scudo.cpp
+++ b/debuggerd/libdebuggerd/scudo.cpp
@@ -18,6 +18,7 @@
#include "libdebuggerd/scudo.h"
#include "libdebuggerd/tombstone.h"
+#include "libdebuggerd/utility_host.h"
#include "unwindstack/AndroidUnwinder.h"
#include "unwindstack/Memory.h"
diff --git a/debuggerd/libdebuggerd/test/tombstone_proto_to_text_test.cpp b/debuggerd/libdebuggerd/test/tombstone_proto_to_text_test.cpp
index 4fd2643..aad209a 100644
--- a/debuggerd/libdebuggerd/test/tombstone_proto_to_text_test.cpp
+++ b/debuggerd/libdebuggerd/test/tombstone_proto_to_text_test.cpp
@@ -22,6 +22,7 @@
#include <android-base/test_utils.h>
#include "libdebuggerd/tombstone.h"
+#include "libdebuggerd/tombstone_proto_to_text.h"
#include "tombstone.pb.h"
using CallbackType = std::function<void(const std::string& line, bool should_log)>;
@@ -60,12 +61,16 @@
void ProtoToString() {
text_ = "";
- EXPECT_TRUE(
- tombstone_proto_to_text(*tombstone_, [this](const std::string& line, bool should_log) {
+ EXPECT_TRUE(tombstone_proto_to_text(
+ *tombstone_,
+ [this](const std::string& line, bool should_log) {
if (should_log) {
text_ += "LOG ";
}
text_ += line + '\n';
+ },
+ [&](const BacktraceFrame& frame) {
+ text_ += "SYMBOLIZE " + frame.build_id() + " " + std::to_string(frame.pc()) + "\n";
}));
}
@@ -162,3 +167,11 @@
EXPECT_MATCH(text_, "stack_record fp:0x1 tag:0xb pc:foo\\.so\\+0x567 \\(BuildId: ABC123\\)");
EXPECT_MATCH(text_, "stack_record fp:0x2 tag:0xc pc:bar\\.so\\+0x678");
}
+
+TEST_F(TombstoneProtoToTextTest, symbolize) {
+ BacktraceFrame* frame = main_thread_->add_current_backtrace();
+ frame->set_pc(12345);
+ frame->set_build_id("0123456789abcdef");
+ ProtoToString();
+ EXPECT_MATCH(text_, "\\(BuildId: 0123456789abcdef\\)\\nSYMBOLIZE 0123456789abcdef 12345\\n");
+}
diff --git a/debuggerd/libdebuggerd/tombstone.cpp b/debuggerd/libdebuggerd/tombstone.cpp
index 0ce5573..30c6fe4 100644
--- a/debuggerd/libdebuggerd/tombstone.cpp
+++ b/debuggerd/libdebuggerd/tombstone.cpp
@@ -17,6 +17,7 @@
#define LOG_TAG "DEBUG"
#include "libdebuggerd/tombstone.h"
+#include "libdebuggerd/tombstone_proto_to_text.h"
#include <errno.h>
#include <signal.h>
@@ -145,7 +146,10 @@
log.tfd = output_fd.get();
log.amfd_data = amfd_data;
- tombstone_proto_to_text(tombstone, [&log](const std::string& line, bool should_log) {
- _LOG(&log, should_log ? logtype::HEADER : logtype::LOGS, "%s\n", line.c_str());
- });
+ tombstone_proto_to_text(
+ tombstone,
+ [&log](const std::string& line, bool should_log) {
+ _LOG(&log, should_log ? logtype::HEADER : logtype::LOGS, "%s\n", line.c_str());
+ },
+ [](const BacktraceFrame&) {});
}
diff --git a/debuggerd/libdebuggerd/tombstone_proto.cpp b/debuggerd/libdebuggerd/tombstone_proto.cpp
index ed4fd53..d59358c 100644
--- a/debuggerd/libdebuggerd/tombstone_proto.cpp
+++ b/debuggerd/libdebuggerd/tombstone_proto.cpp
@@ -69,6 +69,7 @@
#include "libdebuggerd/open_files_list.h"
#include "libdebuggerd/utility.h"
+#include "libdebuggerd/utility_host.h"
#include "util.h"
#include "tombstone.pb.h"
diff --git a/debuggerd/libdebuggerd/tombstone_proto_to_text.cpp b/debuggerd/libdebuggerd/tombstone_proto_to_text.cpp
index c3f9470..fedafc0 100644
--- a/debuggerd/libdebuggerd/tombstone_proto_to_text.cpp
+++ b/debuggerd/libdebuggerd/tombstone_proto_to_text.cpp
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-#include <libdebuggerd/tombstone.h>
+#include <libdebuggerd/tombstone_proto_to_text.h>
+#include <libdebuggerd/utility_host.h>
#include <inttypes.h>
@@ -30,8 +31,6 @@
#include <android-base/stringprintf.h>
#include <android-base/strings.h>
#include <android-base/unique_fd.h>
-#include <bionic/macros.h>
-#include <sys/prctl.h>
#include "tombstone.pb.h"
@@ -42,6 +41,7 @@
#define CBL(...) CB(true, __VA_ARGS__)
#define CBS(...) CB(false, __VA_ARGS__)
using CallbackType = std::function<void(const std::string& line, bool should_log)>;
+using SymbolizeCallbackType = std::function<void(const BacktraceFrame& frame)>;
#define DESCRIBE_FLAG(flag) \
if (value & flag) { \
@@ -57,28 +57,6 @@
return desc.empty() ? "" : " (" + desc.substr(2) + ")";
}
-static std::string describe_tagged_addr_ctrl(long value) {
- std::string desc;
- DESCRIBE_FLAG(PR_TAGGED_ADDR_ENABLE);
- DESCRIBE_FLAG(PR_MTE_TCF_SYNC);
- DESCRIBE_FLAG(PR_MTE_TCF_ASYNC);
- if (value & PR_MTE_TAG_MASK) {
- desc += StringPrintf(", mask 0x%04lx", (value & PR_MTE_TAG_MASK) >> PR_MTE_TAG_SHIFT);
- value &= ~PR_MTE_TAG_MASK;
- }
- return describe_end(value, desc);
-}
-
-static std::string describe_pac_enabled_keys(long value) {
- std::string desc;
- DESCRIBE_FLAG(PR_PAC_APIAKEY);
- DESCRIBE_FLAG(PR_PAC_APIBKEY);
- DESCRIBE_FLAG(PR_PAC_APDAKEY);
- DESCRIBE_FLAG(PR_PAC_APDBKEY);
- DESCRIBE_FLAG(PR_PAC_APGAKEY);
- return describe_end(value, desc);
-}
-
static const char* abi_string(const Architecture& arch) {
switch (arch) {
case Architecture::ARM32:
@@ -113,6 +91,13 @@
}
}
+static uint64_t untag_address(Architecture arch, uint64_t addr) {
+ if (arch == Architecture::ARM64) {
+ return addr & ((1ULL << 56) - 1);
+ }
+ return addr;
+}
+
static void print_thread_header(CallbackType callback, const Tombstone& tombstone,
const Thread& thread, bool should_log) {
const char* process_name = "<unknown>";
@@ -200,7 +185,8 @@
print_register_row(callback, word_size, special_row, should_log);
}
-static void print_backtrace(CallbackType callback, const Tombstone& tombstone,
+static void print_backtrace(CallbackType callback, SymbolizeCallbackType symbolize,
+ const Tombstone& tombstone,
const google::protobuf::RepeatedPtrField<BacktraceFrame>& backtrace,
bool should_log) {
int index = 0;
@@ -225,11 +211,14 @@
}
line += function + build_id;
CB(should_log, "%s", line.c_str());
+
+ symbolize(frame);
}
}
-static void print_thread_backtrace(CallbackType callback, const Tombstone& tombstone,
- const Thread& thread, bool should_log) {
+static void print_thread_backtrace(CallbackType callback, SymbolizeCallbackType symbolize,
+ const Tombstone& tombstone, const Thread& thread,
+ bool should_log) {
CBS("");
CB(should_log, "%d total frames", thread.current_backtrace().size());
CB(should_log, "backtrace:");
@@ -237,7 +226,7 @@
CB(should_log, " NOTE: %s",
android::base::Join(thread.backtrace_note(), "\n NOTE: ").c_str());
}
- print_backtrace(callback, tombstone, thread.current_backtrace(), should_log);
+ print_backtrace(callback, symbolize, tombstone, thread.current_backtrace(), should_log);
}
static void print_thread_memory_dump(CallbackType callback, const Tombstone& tombstone,
@@ -290,10 +279,11 @@
}
}
-static void print_thread(CallbackType callback, const Tombstone& tombstone, const Thread& thread) {
+static void print_thread(CallbackType callback, SymbolizeCallbackType symbolize,
+ const Tombstone& tombstone, const Thread& thread) {
print_thread_header(callback, tombstone, thread, false);
print_thread_registers(callback, tombstone, thread, false);
- print_thread_backtrace(callback, tombstone, thread, false);
+ print_thread_backtrace(callback, symbolize, tombstone, thread, false);
print_thread_memory_dump(callback, tombstone, thread);
}
@@ -321,7 +311,8 @@
size_t tag_index = 0;
size_t num_tags = tags.length();
- uintptr_t fault_granule = untag_address(signal.fault_address()) & ~(kTagGranuleSize - 1);
+ uintptr_t fault_granule =
+ untag_address(tombstone.arch(), signal.fault_address()) & ~(kTagGranuleSize - 1);
for (size_t row = 0; tag_index < num_tags; ++row) {
uintptr_t row_addr =
(memory_dump.begin_address() + row * kNumTagColumns * kTagGranuleSize) & kRowStartMask;
@@ -369,7 +360,7 @@
const Signal& signal_info = tombstone.signal_info();
bool has_fault_address = signal_info.has_fault_address();
- uint64_t fault_address = untag_address(signal_info.fault_address());
+ uint64_t fault_address = untag_address(tombstone.arch(), signal_info.fault_address());
bool preamble_printed = false;
bool printed_fault_address_marker = false;
for (const auto& map : tombstone.memory_mappings()) {
@@ -448,8 +439,8 @@
return oct_encoded;
}
-static void print_main_thread(CallbackType callback, const Tombstone& tombstone,
- const Thread& thread) {
+static void print_main_thread(CallbackType callback, SymbolizeCallbackType symbolize,
+ const Tombstone& tombstone, const Thread& thread) {
print_thread_header(callback, tombstone, thread, true);
const Signal& signal_info = tombstone.signal_info();
@@ -503,7 +494,7 @@
CBL(" in this process. The stack trace below is the first system call or context");
CBL(" switch that was executed after the memory corruption happened.");
}
- print_thread_backtrace(callback, tombstone, thread, true);
+ print_thread_backtrace(callback, symbolize, tombstone, thread, true);
if (tombstone.causes_size() > 1) {
CBS("");
@@ -536,13 +527,13 @@
if (heap_object.deallocation_backtrace_size() != 0) {
CBS("");
CBL("deallocated by thread %" PRIu64 ":", heap_object.deallocation_tid());
- print_backtrace(callback, tombstone, heap_object.deallocation_backtrace(), true);
+ print_backtrace(callback, symbolize, tombstone, heap_object.deallocation_backtrace(), true);
}
if (heap_object.allocation_backtrace_size() != 0) {
CBS("");
CBL("allocated by thread %" PRIu64 ":", heap_object.allocation_tid());
- print_backtrace(callback, tombstone, heap_object.allocation_backtrace(), true);
+ print_backtrace(callback, symbolize, tombstone, heap_object.allocation_backtrace(), true);
}
}
}
@@ -591,8 +582,9 @@
}
}
-static void print_guest_thread(CallbackType callback, const Tombstone& tombstone,
- const Thread& guest_thread, pid_t tid, bool should_log) {
+static void print_guest_thread(CallbackType callback, SymbolizeCallbackType symbolize,
+ const Tombstone& tombstone, const Thread& guest_thread, pid_t tid,
+ bool should_log) {
CBS("--- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---");
CBS("Guest thread information for tid: %d", tid);
print_thread_registers(callback, tombstone, guest_thread, should_log);
@@ -600,12 +592,13 @@
CBS("");
CB(true, "%d total frames", guest_thread.current_backtrace().size());
CB(true, "backtrace:");
- print_backtrace(callback, tombstone, guest_thread.current_backtrace(), should_log);
+ print_backtrace(callback, symbolize, tombstone, guest_thread.current_backtrace(), should_log);
print_thread_memory_dump(callback, tombstone, guest_thread);
}
-bool tombstone_proto_to_text(const Tombstone& tombstone, CallbackType callback) {
+bool tombstone_proto_to_text(const Tombstone& tombstone, CallbackType callback,
+ SymbolizeCallbackType symbolize) {
CBL("*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***");
CBL("Build fingerprint: '%s'", tombstone.build_fingerprint().c_str());
CBL("Revision: '%s'", tombstone.revision().c_str());
@@ -633,14 +626,15 @@
const auto& main_thread = main_thread_it->second;
- print_main_thread(callback, tombstone, main_thread);
+ print_main_thread(callback, symbolize, tombstone, main_thread);
print_logs(callback, tombstone, 50);
const auto& guest_threads = tombstone.guest_threads();
auto main_guest_thread_it = guest_threads.find(tombstone.tid());
if (main_guest_thread_it != threads.end()) {
- print_guest_thread(callback, tombstone, main_guest_thread_it->second, tombstone.tid(), true);
+ print_guest_thread(callback, symbolize, tombstone, main_guest_thread_it->second,
+ tombstone.tid(), true);
}
// protobuf's map is unordered, so sort the keys first.
@@ -653,10 +647,10 @@
for (const auto& tid : thread_ids) {
CBS("--- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---");
- print_thread(callback, tombstone, threads.find(tid)->second);
+ print_thread(callback, symbolize, tombstone, threads.find(tid)->second);
auto guest_thread_it = guest_threads.find(tid);
if (guest_thread_it != guest_threads.end()) {
- print_guest_thread(callback, tombstone, guest_thread_it->second, tid, false);
+ print_guest_thread(callback, symbolize, tombstone, guest_thread_it->second, tid, false);
}
}
diff --git a/debuggerd/libdebuggerd/utility.cpp b/debuggerd/libdebuggerd/utility.cpp
index 742ac7c..b5a93b7 100644
--- a/debuggerd/libdebuggerd/utility.cpp
+++ b/debuggerd/libdebuggerd/utility.cpp
@@ -17,6 +17,7 @@
#define LOG_TAG "DEBUG"
#include "libdebuggerd/utility.h"
+#include "libdebuggerd/utility_host.h"
#include <errno.h>
#include <signal.h>
diff --git a/debuggerd/libdebuggerd/utility_host.cpp b/debuggerd/libdebuggerd/utility_host.cpp
new file mode 100644
index 0000000..72a560c
--- /dev/null
+++ b/debuggerd/libdebuggerd/utility_host.cpp
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2024, 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.
+ */
+
+#include "libdebuggerd/utility_host.h"
+
+#include <sys/prctl.h>
+
+#include <string>
+
+#include <android-base/stringprintf.h>
+
+using android::base::StringPrintf;
+
+#ifndef PR_MTE_TAG_SHIFT
+#define PR_MTE_TAG_SHIFT 3
+#endif
+
+#ifndef PR_MTE_TAG_MASK
+#define PR_MTE_TAG_MASK (0xffffUL << PR_MTE_TAG_SHIFT)
+#endif
+
+#ifndef PR_MTE_TCF_ASYNC
+#define PR_MTE_TCF_ASYNC (1UL << 2)
+#endif
+
+#ifndef PR_MTE_TCF_SYNC
+#define PR_MTE_TCF_SYNC (1UL << 1)
+#endif
+
+#ifndef PR_PAC_APIAKEY
+#define PR_PAC_APIAKEY (1UL << 0)
+#endif
+
+#ifndef PR_PAC_APIBKEY
+#define PR_PAC_APIBKEY (1UL << 1)
+#endif
+
+#ifndef PR_PAC_APDAKEY
+#define PR_PAC_APDAKEY (1UL << 2)
+#endif
+
+#ifndef PR_PAC_APDBKEY
+#define PR_PAC_APDBKEY (1UL << 3)
+#endif
+
+#ifndef PR_PAC_APGAKEY
+#define PR_PAC_APGAKEY (1UL << 4)
+#endif
+
+#ifndef PR_TAGGED_ADDR_ENABLE
+#define PR_TAGGED_ADDR_ENABLE (1UL << 0)
+#endif
+
+#define DESCRIBE_FLAG(flag) \
+ if (value & flag) { \
+ desc += ", "; \
+ desc += #flag; \
+ value &= ~flag; \
+ }
+
+static std::string describe_end(long value, std::string& desc) {
+ if (value) {
+ desc += StringPrintf(", unknown 0x%lx", value);
+ }
+ return desc.empty() ? "" : " (" + desc.substr(2) + ")";
+}
+
+std::string describe_tagged_addr_ctrl(long value) {
+ std::string desc;
+ DESCRIBE_FLAG(PR_TAGGED_ADDR_ENABLE);
+ DESCRIBE_FLAG(PR_MTE_TCF_SYNC);
+ DESCRIBE_FLAG(PR_MTE_TCF_ASYNC);
+ if (value & PR_MTE_TAG_MASK) {
+ desc += StringPrintf(", mask 0x%04lx", (value & PR_MTE_TAG_MASK) >> PR_MTE_TAG_SHIFT);
+ value &= ~PR_MTE_TAG_MASK;
+ }
+ return describe_end(value, desc);
+}
+
+std::string describe_pac_enabled_keys(long value) {
+ std::string desc;
+ DESCRIBE_FLAG(PR_PAC_APIAKEY);
+ DESCRIBE_FLAG(PR_PAC_APIBKEY);
+ DESCRIBE_FLAG(PR_PAC_APDAKEY);
+ DESCRIBE_FLAG(PR_PAC_APDBKEY);
+ DESCRIBE_FLAG(PR_PAC_APGAKEY);
+ return describe_end(value, desc);
+}
diff --git a/debuggerd/pbtombstone.cpp b/debuggerd/pbtombstone.cpp
index 7527e31..0902b38 100644
--- a/debuggerd/pbtombstone.cpp
+++ b/debuggerd/pbtombstone.cpp
@@ -16,32 +16,55 @@
#include <err.h>
#include <fcntl.h>
+#include <getopt.h>
#include <stdio.h>
#include <unistd.h>
+#include <string>
+#include <vector>
+
#include <android-base/unique_fd.h>
-#include <libdebuggerd/tombstone.h>
+#include <libdebuggerd/tombstone_proto_to_text.h>
#include "tombstone.pb.h"
+#include "tombstone_symbolize.h"
using android::base::unique_fd;
[[noreturn]] void usage(bool error) {
- fprintf(stderr, "usage: pbtombstone TOMBSTONE.PB\n");
+ fprintf(stderr, "usage: pbtombstone [OPTION] TOMBSTONE.PB\n");
fprintf(stderr, "Convert a protobuf tombstone to text.\n");
+ fprintf(stderr, "Arguments:\n");
+ fprintf(stderr, " -h, --help print this message\n");
+ fprintf(stderr, " --debug-file-directory PATH specify the path to a symbols directory\n");
exit(error);
}
-int main(int argc, const char* argv[]) {
- if (argc != 2) {
+int main(int argc, char* argv[]) {
+ std::vector<std::string> debug_file_directories;
+ static struct option long_options[] = {
+ {"debug-file-directory", required_argument, 0, 0},
+ {"help", no_argument, 0, 'h'},
+ {},
+ };
+ int c;
+ while ((c = getopt_long(argc, argv, "h", long_options, 0)) != -1) {
+ switch (c) {
+ case 0:
+ debug_file_directories.push_back(optarg);
+ break;
+
+ case 'h':
+ usage(false);
+ break;
+ }
+ }
+
+ if (optind != argc-1) {
usage(true);
}
- if (strcmp("-h", argv[1]) == 0 || strcmp("--help", argv[1]) == 0) {
- usage(false);
- }
-
- unique_fd fd(open(argv[1], O_RDONLY | O_CLOEXEC));
+ unique_fd fd(open(argv[optind], O_RDONLY | O_CLOEXEC));
if (fd == -1) {
err(1, "failed to open tombstone '%s'", argv[1]);
}
@@ -51,8 +74,11 @@
err(1, "failed to parse tombstone");
}
+ Symbolizer sym;
+ sym.Start(debug_file_directories);
bool result = tombstone_proto_to_text(
- tombstone, [](const std::string& line, bool) { printf("%s\n", line.c_str()); });
+ tombstone, [](const std::string& line, bool) { printf("%s\n", line.c_str()); },
+ [&](const BacktraceFrame& frame) { symbolize_backtrace_frame(frame, sym); });
if (!result) {
errx(1, "tombstone was malformed");
diff --git a/debuggerd/proto/Android.bp b/debuggerd/proto/Android.bp
index 7b9e780..70deb3c 100644
--- a/debuggerd/proto/Android.bp
+++ b/debuggerd/proto/Android.bp
@@ -38,6 +38,7 @@
ramdisk_available: true,
recovery_available: true,
vendor_ramdisk_available: true,
+ host_supported: true,
}
java_library_static {
diff --git a/debuggerd/tombstone_symbolize.cpp b/debuggerd/tombstone_symbolize.cpp
new file mode 100644
index 0000000..07735d0
--- /dev/null
+++ b/debuggerd/tombstone_symbolize.cpp
@@ -0,0 +1,160 @@
+/*
+ * Copyright (C) 2024 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.
+ */
+
+#include "tombstone_symbolize.h"
+
+#include <fcntl.h>
+#include <inttypes.h>
+#include <unistd.h>
+
+#include <string>
+#include <vector>
+
+#include "android-base/stringprintf.h"
+#include "android-base/unique_fd.h"
+
+#include "tombstone.pb.h"
+
+using android::base::StringPrintf;
+using android::base::unique_fd;
+
+bool Symbolizer::Start(const std::vector<std::string>& debug_file_directories) {
+ unique_fd parent_in, parent_out, child_in, child_out;
+ if (!Pipe(&parent_in, &child_out) || !Pipe(&child_in, &parent_out)) {
+ return false;
+ }
+
+ std::vector<const char *> args;
+ args.push_back("llvm-symbolizer");
+ for (const std::string &dir : debug_file_directories) {
+ args.push_back("--debug-file-directory");
+ args.push_back(dir.c_str());
+ }
+ args.push_back(0);
+
+ int pid = fork();
+ if (pid == -1) {
+ return false;
+ } else if (pid == 0) {
+ parent_in.reset();
+ parent_out.reset();
+
+ dup2(child_in.get(), STDIN_FILENO);
+ dup2(child_out.get(), STDOUT_FILENO);
+
+ execvp("llvm-symbolizer", const_cast<char *const *>(args.data()));
+
+ fprintf(stderr, "unable to start llvm-symbolizer: %s\n", strerror(errno));
+ _exit(1);
+ } else {
+ child_in.reset();
+ child_out.reset();
+
+ // TODO: Check that llvm-symbolizer started up successfully.
+ // There used to be an easy way to do this, but it was removed in:
+ // https://github.com/llvm/llvm-project/commit/1792852f86dc75efa1f44d46b1a0daf386d64afa
+
+ in_fd = std::move(parent_in);
+ out_fd = std::move(parent_out);
+ return true;
+ }
+}
+
+std::string Symbolizer::read_response() {
+ std::string resp;
+
+ while (resp.size() < 2 || resp[resp.size() - 2] != '\n' || resp[resp.size() - 1] != '\n') {
+ char buf[4096];
+ ssize_t size = read(in_fd, buf, 4096);
+ if (size <= 0) {
+ return "";
+ }
+ resp.append(buf, size);
+ }
+
+ return resp;
+}
+
+std::vector<Symbolizer::Frame> Symbolizer::SymbolizeCode(std::string path, uint64_t rel_pc) {
+ std::string request = StringPrintf("CODE %s 0x%" PRIx64 "\n", path.c_str(), rel_pc);
+ if (write(out_fd, request.c_str(), request.size()) != static_cast<ssize_t>(request.size())) {
+ return {};
+ }
+
+ std::string response = read_response();
+ if (response.empty()) {
+ return {};
+ }
+
+ std::vector<Symbolizer::Frame> frames;
+
+ size_t frame_start = 0;
+ while (frame_start < response.size() - 1) {
+ Symbolizer::Frame frame;
+
+ size_t second_line_start = response.find('\n', frame_start) + 1;
+ if (second_line_start == std::string::npos + 1) {
+ return {};
+ }
+
+ size_t third_line_start = response.find('\n', second_line_start) + 1;
+ if (third_line_start == std::string::npos + 1) {
+ return {};
+ }
+
+ frame.function_name = response.substr(frame_start, second_line_start - frame_start - 1);
+
+ size_t column_number_start = response.rfind(':', third_line_start);
+ if (column_number_start == std::string::npos) {
+ return {};
+ }
+
+ size_t line_number_start = response.rfind(':', column_number_start - 1);
+ if (line_number_start == std::string::npos) {
+ return {};
+ }
+
+ frame.file = response.substr(second_line_start, line_number_start - second_line_start);
+
+ errno = 0;
+ frame.line = strtoull(response.c_str() + line_number_start + 1, 0, 10);
+ frame.column = strtoull(response.c_str() + column_number_start + 1, 0, 10);
+ if (errno != 0) {
+ return {};
+ }
+
+ frames.push_back(frame);
+
+ frame_start = third_line_start;
+ }
+
+ if (frames.size() == 1 && frames[0].file == "??") {
+ return {};
+ }
+
+ return frames;
+}
+
+void symbolize_backtrace_frame(const BacktraceFrame& frame, Symbolizer& sym) {
+ if (frame.build_id().empty()) {
+ return;
+ }
+
+ for (Symbolizer::Frame f : sym.SymbolizeCode("BUILDID:" + frame.build_id(), frame.rel_pc())) {
+ printf(" %s:%" PRId64 ":%" PRId64 " (%s)\n", f.file.c_str(), f.line, f.column,
+ f.function_name.c_str());
+ }
+}
diff --git a/debuggerd/tombstone_symbolize.h b/debuggerd/tombstone_symbolize.h
new file mode 100644
index 0000000..c22d677
--- /dev/null
+++ b/debuggerd/tombstone_symbolize.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2024 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.
+ */
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include "android-base/unique_fd.h"
+
+class BacktraceFrame;
+
+class Symbolizer {
+ android::base::unique_fd in_fd, out_fd;
+
+ std::string read_response();
+
+ public:
+ bool Start(const std::vector<std::string>& debug_file_directories);
+
+ struct Frame {
+ std::string function_name, file;
+ uint64_t line, column;
+ };
+
+ std::vector<Frame> SymbolizeCode(std::string path, uint64_t rel_pc);
+};
+
+void symbolize_backtrace_frame(const BacktraceFrame& frame, Symbolizer& sym);
diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp
index 9f52f44..e4d6986 100644
--- a/fs_mgr/fs_mgr.cpp
+++ b/fs_mgr/fs_mgr.cpp
@@ -822,6 +822,9 @@
if (read_only) {
mountflags |= MS_RDONLY;
}
+ if (!fs_mgr_set_blk_ro(source, read_only)) {
+ PLOG(ERROR) << "Failed to set " << source << " as " << (read_only ? "RO" : "RW");
+ }
int ret = 0;
int save_errno = 0;
int gc_allowance = 0;
@@ -876,9 +879,6 @@
}
PINFO << __FUNCTION__ << "(source=" << source << source_missing << ",target=" << target
<< target_missing << ",type=" << entry.fs_type << ")=" << ret;
- if ((ret == 0) && (mountflags & MS_RDONLY) != 0) {
- fs_mgr_set_blk_ro(source);
- }
if (ret == 0) {
android::base::SetProperty("ro.boottime.init.mount." + Basename(target),
std::to_string(t.duration().count()));
diff --git a/fs_mgr/libsnapshot/snapuserd/Android.bp b/fs_mgr/libsnapshot/snapuserd/Android.bp
index e4d2d04..06c27e7 100644
--- a/fs_mgr/libsnapshot/snapuserd/Android.bp
+++ b/fs_mgr/libsnapshot/snapuserd/Android.bp
@@ -88,7 +88,6 @@
"libprocessgroup",
"libprocessgroup_util",
"libjsoncpp",
- "libcgrouprc",
],
include_dirs: ["bionic/libc/kernel"],
export_include_dirs: ["include"],
@@ -132,7 +131,6 @@
"libprocessgroup",
"libprocessgroup_util",
"libjsoncpp",
- "libcgrouprc",
"libsnapuserd_client",
"libz",
"liblz4",
@@ -224,7 +222,6 @@
"libprocessgroup",
"libprocessgroup_util",
"libjsoncpp",
- "libcgrouprc",
"liburing",
"libz",
],
@@ -319,7 +316,6 @@
"libsnapuserd",
"libprocessgroup",
"libjsoncpp",
- "libcgrouprc",
"liburing",
"libz",
],
diff --git a/fs_mgr/libsnapshot/snapuserd/snapuserd_client.cpp b/fs_mgr/libsnapshot/snapuserd/snapuserd_client.cpp
index ddefb9f..7c820f3 100644
--- a/fs_mgr/libsnapshot/snapuserd/snapuserd_client.cpp
+++ b/fs_mgr/libsnapshot/snapuserd/snapuserd_client.cpp
@@ -311,6 +311,11 @@
}
std::string response = Receivemsg();
+ // If server socket disconnects most likely because of device reboot,
+ // then we just return 0.
+ if (response.empty()) {
+ return 0.0;
+ }
return std::stod(response);
}
diff --git a/init/block_dev_initializer.cpp b/init/block_dev_initializer.cpp
index cabeb01..8f52158 100644
--- a/init/block_dev_initializer.cpp
+++ b/init/block_dev_initializer.cpp
@@ -98,11 +98,7 @@
LOG(VERBOSE) << __PRETTY_FUNCTION__ << ": found partition: " << name;
- // Remove partition from the list only if it was found on boot device
- if (device_handler_->IsBootDevice(uevent)) {
- devices->erase(iter);
- }
-
+ devices->erase(iter);
device_handler_->HandleUevent(uevent);
return devices->empty() ? ListenerAction::kStop : ListenerAction::kContinue;
}
diff --git a/init/devices.cpp b/init/devices.cpp
index 6a3a64d..f2bb9d2 100644
--- a/init/devices.cpp
+++ b/init/devices.cpp
@@ -188,28 +188,6 @@
}
}
-bool DeviceHandler::IsBootDevice(const Uevent& uevent) const {
- std::string device;
-
- if (FindPlatformDevice(uevent.path, &device)) {
- // Skip /devices/platform or /devices/ if present
- static constexpr std::string_view devices_platform_prefix = "/devices/platform/";
- static constexpr std::string_view devices_prefix = "/devices/";
-
- if (StartsWith(device, devices_platform_prefix)) {
- device = device.substr(devices_platform_prefix.length());
- } else if (StartsWith(device, devices_prefix)) {
- device = device.substr(devices_prefix.length());
- }
- } else if (FindPciDevicePrefix(uevent.path, &device)) {
- } else if (FindVbdDevicePrefix(uevent.path, &device)) {
- } else {
- return false;
- }
-
- return boot_devices_.find(device) != boot_devices_.end();
-}
-
std::string DeviceHandler::GetPartitionNameForDevice(const std::string& query_device) {
static const auto partition_map = [] {
std::vector<std::pair<std::string, std::string>> partition_map;
diff --git a/init/devices.h b/init/devices.h
index 4df604d..6da1232 100644
--- a/init/devices.h
+++ b/init/devices.h
@@ -133,7 +133,6 @@
// `androidboot.partition_map=vdb,metadata;vdc,userdata` maps `vdb` to `metadata` and `vdc` to
// `userdata`.
static std::string GetPartitionNameForDevice(const std::string& device);
- bool IsBootDevice(const Uevent& uevent) const;
private:
void ColdbootDone() override;
diff --git a/init/firmware_handler.cpp b/init/firmware_handler.cpp
index 01957ef..dcfda52 100644
--- a/init/firmware_handler.cpp
+++ b/init/firmware_handler.cpp
@@ -38,6 +38,8 @@
#include <android-base/strings.h>
#include <android-base/unique_fd.h>
+#include "exthandler/exthandler.h"
+
using android::base::ReadFdToString;
using android::base::Socketpair;
using android::base::Split;
@@ -136,100 +138,6 @@
: firmware_directories_(std::move(firmware_directories)),
external_firmware_handlers_(std::move(external_firmware_handlers)) {}
-Result<std::string> FirmwareHandler::RunExternalHandler(const std::string& handler, uid_t uid,
- gid_t gid, const Uevent& uevent) const {
- unique_fd child_stdout;
- unique_fd parent_stdout;
- if (!Socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, &child_stdout, &parent_stdout)) {
- return ErrnoError() << "Socketpair() for stdout failed";
- }
-
- unique_fd child_stderr;
- unique_fd parent_stderr;
- if (!Socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, &child_stderr, &parent_stderr)) {
- return ErrnoError() << "Socketpair() for stderr failed";
- }
-
- signal(SIGCHLD, SIG_DFL);
-
- auto pid = fork();
- if (pid < 0) {
- return ErrnoError() << "fork() failed";
- }
-
- if (pid == 0) {
- setenv("FIRMWARE", uevent.firmware.c_str(), 1);
- setenv("DEVPATH", uevent.path.c_str(), 1);
- parent_stdout.reset();
- parent_stderr.reset();
- close(STDOUT_FILENO);
- close(STDERR_FILENO);
- dup2(child_stdout.get(), STDOUT_FILENO);
- dup2(child_stderr.get(), STDERR_FILENO);
-
- auto args = Split(handler, " ");
- std::vector<char*> c_args;
- for (auto& arg : args) {
- c_args.emplace_back(arg.data());
- }
- c_args.emplace_back(nullptr);
-
- if (gid != 0) {
- if (setgid(gid) != 0) {
- fprintf(stderr, "setgid() failed: %s", strerror(errno));
- _exit(EXIT_FAILURE);
- }
- }
-
- if (setuid(uid) != 0) {
- fprintf(stderr, "setuid() failed: %s", strerror(errno));
- _exit(EXIT_FAILURE);
- }
-
- execv(c_args[0], c_args.data());
- fprintf(stderr, "exec() failed: %s", strerror(errno));
- _exit(EXIT_FAILURE);
- }
-
- child_stdout.reset();
- child_stderr.reset();
-
- int status;
- pid_t waited_pid = TEMP_FAILURE_RETRY(waitpid(pid, &status, 0));
- if (waited_pid == -1) {
- return ErrnoError() << "waitpid() failed";
- }
-
- std::string stdout_content;
- if (!ReadFdToString(parent_stdout.get(), &stdout_content)) {
- return ErrnoError() << "ReadFdToString() for stdout failed";
- }
-
- std::string stderr_content;
- if (ReadFdToString(parent_stderr.get(), &stderr_content)) {
- auto messages = Split(stderr_content, "\n");
- for (const auto& message : messages) {
- if (!message.empty()) {
- LOG(ERROR) << "External Firmware Handler: " << message;
- }
- }
- } else {
- LOG(ERROR) << "ReadFdToString() for stderr failed";
- }
-
- if (WIFEXITED(status)) {
- if (WEXITSTATUS(status) == EXIT_SUCCESS) {
- return Trim(stdout_content);
- } else {
- return Error() << "exited with status " << WEXITSTATUS(status);
- }
- } else if (WIFSIGNALED(status)) {
- return Error() << "killed by signal " << WTERMSIG(status);
- }
-
- return Error() << "unexpected exit status " << status;
-}
-
std::string FirmwareHandler::GetFirmwarePath(const Uevent& uevent) const {
for (const auto& external_handler : external_firmware_handlers_) {
if (external_handler.match(uevent.path)) {
@@ -237,11 +145,15 @@
<< "' for devpath: '" << uevent.path << "' firmware: '" << uevent.firmware
<< "'";
+ std::unordered_map<std::string, std::string> envs_map;
+ envs_map["FIRMWARE"] = uevent.firmware;
+ envs_map["DEVPATH"] = uevent.path;
+
auto result = RunExternalHandler(external_handler.handler_path, external_handler.uid,
- external_handler.gid, uevent);
+ external_handler.gid, envs_map);
if (!result.ok() && NeedsRerunExternalHandler()) {
auto res = RunExternalHandler(external_handler.handler_path, external_handler.uid,
- external_handler.gid, uevent);
+ external_handler.gid, envs_map);
result = std::move(res);
}
if (!result.ok()) {
diff --git a/init/firmware_handler.h b/init/firmware_handler.h
index fceb392..e5d3538 100644
--- a/init/firmware_handler.h
+++ b/init/firmware_handler.h
@@ -54,8 +54,6 @@
friend void FirmwareTestWithExternalHandler(const std::string& test_name,
bool expect_new_firmware);
- Result<std::string> RunExternalHandler(const std::string& handler, uid_t uid, gid_t gid,
- const Uevent& uevent) const;
std::string GetFirmwarePath(const Uevent& uevent) const;
void ProcessFirmwareEvent(const std::string& path, const std::string& firmware) const;
bool ForEachFirmwareDirectory(std::function<bool(const std::string&)> handler) const;
diff --git a/libcutils/Android.bp b/libcutils/Android.bp
index fc4c571..1039288 100644
--- a/libcutils/Android.bp
+++ b/libcutils/Android.bp
@@ -1,4 +1,5 @@
package {
+ default_team: "trendy_team_native_tools_libraries",
default_applicable_licenses: ["system_core_libcutils_license"],
}
@@ -278,7 +279,6 @@
"liblog",
"libbase",
"libprocessgroup",
- "libcgrouprc",
]
cc_test {
diff --git a/libmodprobe/Android.bp b/libmodprobe/Android.bp
index 12906cc..78b4c83 100644
--- a/libmodprobe/Android.bp
+++ b/libmodprobe/Android.bp
@@ -13,6 +13,7 @@
vendor_ramdisk_available: true,
host_supported: true,
srcs: [
+ "exthandler.cpp",
"libmodprobe.cpp",
"libmodprobe_ext.cpp",
],
@@ -30,6 +31,7 @@
],
local_include_dirs: ["include/"],
srcs: [
+ "exthandler.cpp",
"libmodprobe_test.cpp",
"libmodprobe.cpp",
"libmodprobe_ext_test.cpp",
diff --git a/libmodprobe/exthandler.cpp b/libmodprobe/exthandler.cpp
new file mode 100644
index 0000000..f48c259
--- /dev/null
+++ b/libmodprobe/exthandler.cpp
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2024 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.
+ */
+
+#include <exthandler/exthandler.h>
+
+#include <android-base/chrono_utils.h>
+#include <android-base/file.h>
+#include <android-base/logging.h>
+#include <android-base/parseint.h>
+#include <android-base/strings.h>
+#include <android-base/unique_fd.h>
+#include <fnmatch.h>
+#include <grp.h>
+#include <pwd.h>
+#include <sys/wait.h>
+
+using android::base::ErrnoError;
+using android::base::Error;
+using android::base::ReadFdToString;
+using android::base::Result;
+using android::base::Split;
+using android::base::Trim;
+using android::base::unique_fd;
+
+Result<std::string> RunExternalHandler(const std::string& handler, uid_t uid, gid_t gid,
+ std::unordered_map<std::string, std::string>& envs_map) {
+ unique_fd child_stdout;
+ unique_fd parent_stdout;
+ if (!Socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, &child_stdout, &parent_stdout)) {
+ return ErrnoError() << "Socketpair() for stdout failed";
+ }
+
+ unique_fd child_stderr;
+ unique_fd parent_stderr;
+ if (!Socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, &child_stderr, &parent_stderr)) {
+ return ErrnoError() << "Socketpair() for stderr failed";
+ }
+
+ signal(SIGCHLD, SIG_DFL);
+
+ auto pid = fork();
+ if (pid < 0) {
+ return ErrnoError() << "fork() failed";
+ }
+
+ if (pid == 0) {
+ for (auto it = envs_map.begin(); it != envs_map.end(); ++it) {
+ setenv(it->first.c_str(), it->second.c_str(), 1);
+ }
+ parent_stdout.reset();
+ parent_stderr.reset();
+ close(STDOUT_FILENO);
+ close(STDERR_FILENO);
+ dup2(child_stdout.get(), STDOUT_FILENO);
+ dup2(child_stderr.get(), STDERR_FILENO);
+
+ auto args = Split(handler, " ");
+ std::vector<char*> c_args;
+ for (auto& arg : args) {
+ c_args.emplace_back(arg.data());
+ }
+ c_args.emplace_back(nullptr);
+
+ if (gid != 0) {
+ if (setgid(gid) != 0) {
+ fprintf(stderr, "setgid() failed: %s", strerror(errno));
+ _exit(EXIT_FAILURE);
+ }
+ }
+
+ if (setuid(uid) != 0) {
+ fprintf(stderr, "setuid() failed: %s", strerror(errno));
+ _exit(EXIT_FAILURE);
+ }
+
+ execv(c_args[0], c_args.data());
+ fprintf(stderr, "exec() failed: %s", strerror(errno));
+ _exit(EXIT_FAILURE);
+ }
+
+ child_stdout.reset();
+ child_stderr.reset();
+
+ int status;
+ pid_t waited_pid = TEMP_FAILURE_RETRY(waitpid(pid, &status, 0));
+ if (waited_pid == -1) {
+ return ErrnoError() << "waitpid() failed";
+ }
+
+ std::string stdout_content;
+ if (!ReadFdToString(parent_stdout.get(), &stdout_content)) {
+ return ErrnoError() << "ReadFdToString() for stdout failed";
+ }
+
+ std::string stderr_content;
+ if (ReadFdToString(parent_stderr.get(), &stderr_content)) {
+ auto messages = Split(stderr_content, "\n");
+ for (const auto& message : messages) {
+ if (!message.empty()) {
+ LOG(ERROR) << "External Handler: " << message;
+ }
+ }
+ } else {
+ LOG(ERROR) << "ReadFdToString() for stderr failed";
+ }
+
+ if (WIFEXITED(status)) {
+ if (WEXITSTATUS(status) == EXIT_SUCCESS) {
+ return Trim(stdout_content);
+ } else {
+ return Error() << "exited with status " << WEXITSTATUS(status);
+ }
+ } else if (WIFSIGNALED(status)) {
+ return Error() << "killed by signal " << WTERMSIG(status);
+ }
+
+ return Error() << "unexpected exit status " << status;
+}
diff --git a/libmodprobe/include/exthandler/exthandler.h b/libmodprobe/include/exthandler/exthandler.h
new file mode 100644
index 0000000..232aa95
--- /dev/null
+++ b/libmodprobe/include/exthandler/exthandler.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2024 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.
+ */
+
+#pragma once
+#include <android-base/result.h>
+#include <string>
+
+android::base::Result<std::string> RunExternalHandler(
+ const std::string& handler, uid_t uid, gid_t gid,
+ std::unordered_map<std::string, std::string>& envs_map);
diff --git a/libmodprobe/include/modprobe/modprobe.h b/libmodprobe/include/modprobe/modprobe.h
index d7a90c4..7b691b1 100644
--- a/libmodprobe/include/modprobe/modprobe.h
+++ b/libmodprobe/include/modprobe/modprobe.h
@@ -59,6 +59,7 @@
bool ParseSoftdepCallback(const std::vector<std::string>& args);
bool ParseLoadCallback(const std::vector<std::string>& args);
bool ParseOptionsCallback(const std::vector<std::string>& args);
+ bool ParseDynOptionsCallback(const std::vector<std::string>& args);
bool ParseBlocklistCallback(const std::vector<std::string>& args);
void ParseKernelCmdlineOptions();
void ParseCfg(const std::string& cfg, std::function<bool(const std::vector<std::string>&)> f);
diff --git a/libmodprobe/libmodprobe.cpp b/libmodprobe/libmodprobe.cpp
index 8cc0b9b..bdd114c 100644
--- a/libmodprobe/libmodprobe.cpp
+++ b/libmodprobe/libmodprobe.cpp
@@ -17,8 +17,11 @@
#include <modprobe/modprobe.h>
#include <fnmatch.h>
+#include <grp.h>
+#include <pwd.h>
#include <sys/stat.h>
#include <sys/syscall.h>
+#include <sys/wait.h>
#include <algorithm>
#include <map>
@@ -30,9 +33,12 @@
#include <android-base/chrono_utils.h>
#include <android-base/file.h>
#include <android-base/logging.h>
+#include <android-base/parseint.h>
#include <android-base/strings.h>
#include <android-base/unique_fd.h>
+#include "exthandler/exthandler.h"
+
std::string Modprobe::MakeCanonical(const std::string& module_path) {
auto start = module_path.find_last_of('/');
if (start == std::string::npos) {
@@ -164,6 +170,10 @@
auto it = args.begin();
const std::string& type = *it++;
+ if (type == "dyn_options") {
+ return ParseDynOptionsCallback(std::vector<std::string>(it, args.end()));
+ }
+
if (type != "options") {
LOG(ERROR) << "non-options line encountered in modules.options";
return false;
@@ -197,6 +207,57 @@
return true;
}
+bool Modprobe::ParseDynOptionsCallback(const std::vector<std::string>& args) {
+ auto it = args.begin();
+ int arg_size = 3;
+
+ if (args.size() < arg_size) {
+ LOG(ERROR) << "dyn_options lines in modules.options must have at least" << arg_size
+ << " entries, not " << args.size();
+ return false;
+ }
+
+ const std::string& module = *it++;
+
+ const std::string& canonical_name = MakeCanonical(module);
+ if (canonical_name.empty()) {
+ return false;
+ }
+
+ const std::string& pwnam = *it++;
+ passwd* pwd = getpwnam(pwnam.c_str());
+ if (!pwd) {
+ LOG(ERROR) << "invalid handler uid'" << pwnam << "'";
+ return false;
+ }
+
+ std::string handler_with_args =
+ android::base::Join(std::vector<std::string>(it, args.end()), ' ');
+ handler_with_args.erase(std::remove(handler_with_args.begin(), handler_with_args.end(), '\"'),
+ handler_with_args.end());
+
+ LOG(DEBUG) << "Launching external module options handler: '" << handler_with_args
+ << " for module: " << module;
+
+ // There is no need to set envs for external module options handler - pass
+ // empty map.
+ std::unordered_map<std::string, std::string> envs_map;
+ auto result = RunExternalHandler(handler_with_args, pwd->pw_uid, 0, envs_map);
+ if (!result.ok()) {
+ LOG(ERROR) << "External module handler failed: " << result.error();
+ return false;
+ }
+
+ LOG(INFO) << "Dynamic options for module: " << module << " are '" << *result << "'";
+
+ auto [unused, inserted] = this->module_options_.emplace(canonical_name, *result);
+ if (!inserted) {
+ LOG(ERROR) << "multiple options lines present for module " << module;
+ return false;
+ }
+ return true;
+}
+
bool Modprobe::ParseBlocklistCallback(const std::vector<std::string>& args) {
auto it = args.begin();
const std::string& type = *it++;
diff --git a/libprocessgroup/Android.bp b/libprocessgroup/Android.bp
index 8448a39..1e76e76 100644
--- a/libprocessgroup/Android.bp
+++ b/libprocessgroup/Android.bp
@@ -110,7 +110,6 @@
],
shared_libs: [
"libbase",
- "libcgrouprc",
"libprocessgroup",
],
static_libs: [
diff --git a/libprocessgroup/setup/Android.bp b/libprocessgroup/setup/Android.bp
index cc6c67c..25737f5 100644
--- a/libprocessgroup/setup/Android.bp
+++ b/libprocessgroup/setup/Android.bp
@@ -29,7 +29,6 @@
],
shared_libs: [
"libbase",
- "libcgrouprc",
"libjsoncpp",
],
static_libs: [
diff --git a/libprocessgroup/task_profiles.cpp b/libprocessgroup/task_profiles.cpp
index c96feb3..dc6c8c0 100644
--- a/libprocessgroup/task_profiles.cpp
+++ b/libprocessgroup/task_profiles.cpp
@@ -20,6 +20,7 @@
#include <task_profiles.h>
#include <map>
+#include <optional>
#include <string>
#include <dirent.h>
@@ -54,6 +55,7 @@
static constexpr const char* TEMPLATE_TASK_PROFILE_API_FILE =
"/etc/task_profiles/task_profiles_%u.json";
+namespace {
class FdCacheHelper {
public:
@@ -64,8 +66,11 @@
};
static void Cache(const std::string& path, android::base::unique_fd& fd);
+
static void Drop(android::base::unique_fd& fd);
+
static void Init(const std::string& path, android::base::unique_fd& fd);
+
static bool IsCached(const android::base::unique_fd& fd) { return fd > FDS_INACCESSIBLE; }
private:
@@ -116,6 +121,17 @@
return path.find("<uid>", 0) != std::string::npos || path.find("<pid>", 0) != std::string::npos;
}
+std::optional<long> readLong(const std::string& str) {
+ char* end;
+ const long result = strtol(str.c_str(), &end, 10);
+ if (end > str.c_str()) {
+ return result;
+ }
+ return std::nullopt;
+}
+
+} // namespace
+
IProfileAttribute::~IProfileAttribute() = default;
const std::string& ProfileAttribute::file_name() const {
@@ -913,15 +929,12 @@
LOG(WARNING) << "JoinCgroup: controller " << controller_name << " is not found";
}
} else if (action_name == "SetTimerSlack") {
- std::string slack_value = params_val["Slack"].asString();
- char* end;
- unsigned long slack;
-
- slack = strtoul(slack_value.c_str(), &end, 10);
- if (end > slack_value.c_str()) {
- profile->Add(std::make_unique<SetTimerSlackAction>(slack));
+ const std::string slack_string = params_val["Slack"].asString();
+ std::optional<long> slack = readLong(slack_string);
+ if (slack && *slack >= 0) {
+ profile->Add(std::make_unique<SetTimerSlackAction>(*slack));
} else {
- LOG(WARNING) << "SetTimerSlack: invalid parameter: " << slack_value;
+ LOG(WARNING) << "SetTimerSlack: invalid parameter: " << slack_string;
}
} else if (action_name == "SetAttribute") {
std::string attr_name = params_val["Name"].asString();
@@ -980,15 +993,19 @@
// If present, this optional value will be passed in an additional syscall
// to setpriority(), since the sched_priority value must be 0 for calls to
// sched_setscheduler() with "normal" policies.
- const int nice = params_val["Nice"].asInt();
+ const std::string nice_string = params_val["Nice"].asString();
+ const std::optional<int> nice = readLong(nice_string);
+ if (!nice) {
+ LOG(FATAL) << "Invalid nice value specified: " << nice_string;
+ }
const int LINUX_MIN_NICE = -20;
const int LINUX_MAX_NICE = 19;
- if (nice < LINUX_MIN_NICE || nice > LINUX_MAX_NICE) {
- LOG(WARNING) << "SetSchedulerPolicy: Provided nice (" << nice
+ if (*nice < LINUX_MIN_NICE || *nice > LINUX_MAX_NICE) {
+ LOG(WARNING) << "SetSchedulerPolicy: Provided nice (" << *nice
<< ") appears out of range.";
}
- profile->Add(std::make_unique<SetSchedulerPolicyAction>(policy, nice));
+ profile->Add(std::make_unique<SetSchedulerPolicyAction>(policy, *nice));
} else {
profile->Add(std::make_unique<SetSchedulerPolicyAction>(policy));
}
@@ -1001,11 +1018,18 @@
// This is a "virtual priority" as described by `man 2 sched_get_priority_min`
// that will be mapped onto the following range for the provided policy:
// [sched_get_priority_min(), sched_get_priority_max()]
- const int virtual_priority = params_val["Priority"].asInt();
- int priority;
- if (SetSchedulerPolicyAction::toPriority(policy, virtual_priority, priority)) {
- profile->Add(std::make_unique<SetSchedulerPolicyAction>(policy, priority));
+ const std::string priority_string = params_val["Priority"].asString();
+ std::optional<long> virtual_priority = readLong(priority_string);
+ if (virtual_priority && *virtual_priority > 0) {
+ int priority;
+ if (SetSchedulerPolicyAction::toPriority(policy, *virtual_priority,
+ priority)) {
+ profile->Add(
+ std::make_unique<SetSchedulerPolicyAction>(policy, priority));
+ }
+ } else {
+ LOG(WARNING) << "Invalid priority value: " << priority_string;
}
}
} else {
diff --git a/mkbootfs/mkbootfs.cpp b/mkbootfs/mkbootfs.cpp
index 65cf497..a45c6a2 100644
--- a/mkbootfs/mkbootfs.cpp
+++ b/mkbootfs/mkbootfs.cpp
@@ -19,6 +19,9 @@
#include <private/android_filesystem_config.h>
#include <private/fs_config.h>
+#include <android-base/file.h>
+#include <string>
+
/* NOTES
**
** - see https://www.kernel.org/doc/Documentation/early-userspace/buffer-format.txt
@@ -212,20 +215,12 @@
if(lstat(in, &s)) err(1, "could not stat '%s'", in);
if(S_ISREG(s.st_mode)){
- int fd = open(in, O_RDONLY);
- if(fd < 0) err(1, "cannot open '%s' for read", in);
-
- char* tmp = (char*) malloc(s.st_size);
- if(tmp == 0) errx(1, "cannot allocate %zd bytes", s.st_size);
-
- if(read(fd, tmp, s.st_size) != s.st_size) {
- err(1, "cannot read %zd bytes", s.st_size);
+ std::string content;
+ if (!android::base::ReadFileToString(in, &content)) {
+ err(1, "cannot read '%s'", in);
}
- _eject(&s, out, olen, tmp, s.st_size);
-
- free(tmp);
- close(fd);
+ _eject(&s, out, olen, content.data(), content.size());
} else if(S_ISDIR(s.st_mode)) {
_eject(&s, out, olen, 0, 0);
_archive_dir(in, out, ilen, olen);
diff --git a/trusty/keymint/android.hardware.security.keymint-service.rust.trusty.system.nonsecure.rc b/trusty/keymint/android.hardware.security.keymint-service.rust.trusty.system.nonsecure.rc
index 2799188..ca6132e 100644
--- a/trusty/keymint/android.hardware.security.keymint-service.rust.trusty.system.nonsecure.rc
+++ b/trusty/keymint/android.hardware.security.keymint-service.rust.trusty.system.nonsecure.rc
@@ -12,6 +12,6 @@
# TODO(b/357821690): Start the KeyMint HALs when the KeyMint VM is ready once the Trusty VM
# has a mechanism to notify the host.
on late-fs && property:ro.hardware.security.keymint.trusty.system=1 && \
- property:trusty_vm_system.vm_cid=*
- setprop system.keymint.trusty_ipc_dev VSOCK:${trusty_vm_system.vm_cid}:1
+ property:trusty.security_vm.vm_cid=*
+ setprop system.keymint.trusty_ipc_dev VSOCK:${trusty.security_vm.vm_cid}:1
start system.keymint.rust-trusty.nonsecure
diff --git a/trusty/utils/rpmb_dev/rpmb_dev.system.rc b/trusty/utils/rpmb_dev/rpmb_dev.system.rc
index b78c4e2..52419ed 100644
--- a/trusty/utils/rpmb_dev/rpmb_dev.system.rc
+++ b/trusty/utils/rpmb_dev/rpmb_dev.system.rc
@@ -24,7 +24,7 @@
# storageproxyd
on late-fs && \
- property:trusty_vm_system_nonsecure.ready=1 && \
+ property:trusty.security_vm.nonsecure_vm_ready=1 && \
property:storageproxyd_system.trusty_ipc_dev=*
wait /dev/socket/rpmb_mock_system
start storageproxyd_system
@@ -32,8 +32,8 @@
# RPMB Mock
on post-fs && \
- property:trusty_vm_system_nonsecure.ready=1 && \
- property:trusty_vm_system.vm_cid=*
+ property:trusty.security_vm.nonsecure_vm_ready=1 && \
+ property:trusty.security_vm.vm_cid=*
# Create a persistent location for the RPMB data
# (work around lack of RPMb block device on CF).
# file contexts secure_storage_rpmb_system_file
@@ -49,12 +49,12 @@
mkdir /mnt/secure_storage_persist_system 0770 system system
symlink /metadata/secure_storage_persist_system \
/mnt/secure_storage_persist_system/persist
- setprop storageproxyd_system.trusty_ipc_dev VSOCK:${trusty_vm_system.vm_cid}:1
+ setprop storageproxyd_system.trusty_ipc_dev VSOCK:${trusty.security_vm.vm_cid}:1
exec_start rpmb_mock_init_system
start rpmb_mock_system
on post-fs-data && \
- property:trusty_vm_system_nonsecure.ready=1 && \
+ property:trusty.security_vm.nonsecure_vm_ready=1 && \
property:storageproxyd_system.trusty_ipc_dev=*
# file contexts secure_storage_system_file
mkdir /data/secure_storage_system 0770 root system