Break android_set_abort_message out of libc_logging.
libc_logging is getting statically linked into the crash handler
library, resulting in two copies of the abort message code existing in
processes, one in the linker, and one in the crash handler.
Move android_set_abort_message to its own file to solve this.
Bug: http://b/36862204
Test: /data/nativetest/debuggerd_test/debuggerd_test32
Change-Id: Ie198c5a3bb07645aa43296915c9a6752693f14a9
(cherry picked from commit 10ec9286ae843b0a84438699458ba17bff2f5602)
diff --git a/libc/Android.bp b/libc/Android.bp
index 5d0e8c7..8154470 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -775,6 +775,10 @@
"bionic/vdso.cpp",
"bionic/setjmp_cookie.cpp",
+ // The following must not be statically linked into libc_ndk.a, because
+ // debuggerd will look for the abort message in libc.so's copy.
+ "bionic/android_set_abort_message.cpp",
+
"bionic/__memcpy_chk.cpp",
"bionic/__strcat_chk.cpp",
"bionic/__strcpy_chk.cpp",
diff --git a/libc/bionic/android_set_abort_message.cpp b/libc/bionic/android_set_abort_message.cpp
new file mode 100644
index 0000000..2a11613
--- /dev/null
+++ b/libc/bionic/android_set_abort_message.cpp
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <android/set_abort_message.h>
+
+#include <pthread.h>
+#include <sys/mman.h>
+
+#include "private/ScopedPthreadMutexLocker.h"
+
+static pthread_mutex_t g_abort_msg_lock = PTHREAD_MUTEX_INITIALIZER;
+
+struct abort_msg_t {
+ size_t size;
+ char msg[0];
+};
+
+abort_msg_t** __abort_message_ptr; // Accessible to __libc_init_common.
+
+void android_set_abort_message(const char* msg) {
+ ScopedPthreadMutexLocker locker(&g_abort_msg_lock);
+
+ if (__abort_message_ptr == nullptr) {
+ // We must have crashed _very_ early.
+ return;
+ }
+
+ if (*__abort_message_ptr != nullptr) {
+ // We already have an abort message.
+ // Assume that the first crash is the one most worth reporting.
+ return;
+ }
+
+ size_t size = sizeof(abort_msg_t) + strlen(msg) + 1;
+ void* map = mmap(nullptr, size, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0);
+ if (map == MAP_FAILED) {
+ return;
+ }
+
+ abort_msg_t* new_abort_message = reinterpret_cast<abort_msg_t*>(map);
+ new_abort_message->size = size;
+ strcpy(new_abort_message->msg, msg);
+ *__abort_message_ptr = new_abort_message;
+}
diff --git a/libc/bionic/libc_logging.cpp b/libc/bionic/libc_logging.cpp
index a5b68fb..cd92514 100644
--- a/libc/bionic/libc_logging.cpp
+++ b/libc/bionic/libc_logging.cpp
@@ -50,10 +50,6 @@
#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_
#include <sys/_system_properties.h>
-static pthread_mutex_t g_abort_msg_lock = PTHREAD_MUTEX_INITIALIZER;
-
-__LIBC_HIDDEN__ abort_msg_t** __abort_message_ptr; // Accessible to __libc_init_common.
-
// Must be kept in sync with frameworks/base/core/java/android/util/EventLog.java.
enum AndroidEventLogType {
EVENT_TYPE_INT = 0,
@@ -632,34 +628,3 @@
va_end(args);
abort();
}
-
-void android_set_abort_message(const char* msg) {
- ScopedPthreadMutexLocker locker(&g_abort_msg_lock);
-
- if (__abort_message_ptr == NULL) {
- // We must have crashed _very_ early.
- return;
- }
-
- if (*__abort_message_ptr != NULL) {
- // We already have an abort message.
- // Assume that the first crash is the one most worth reporting.
- return;
- }
-
- size_t size = sizeof(abort_msg_t) + strlen(msg) + 1;
- void* map = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0);
- if (map == MAP_FAILED) {
- return;
- }
-
- // TODO: if we stick to the current "one-shot" scheme, we can remove this code and
- // stop storing the size.
- if (*__abort_message_ptr != NULL) {
- munmap(*__abort_message_ptr, (*__abort_message_ptr)->size);
- }
- abort_msg_t* new_abort_message = reinterpret_cast<abort_msg_t*>(map);
- new_abort_message->size = size;
- strcpy(new_abort_message->msg, msg);
- *__abort_message_ptr = new_abort_message;
-}
diff --git a/libc/private/libc_logging.h b/libc/private/libc_logging.h
index d3e4140..486ace5 100644
--- a/libc/private/libc_logging.h
+++ b/libc/private/libc_logging.h
@@ -62,11 +62,6 @@
LOG_ID_MAX
};
-struct abort_msg_t {
- size_t size;
- char msg[0];
-};
-
// Formats a message to the log (priority 'fatal'), then aborts.
__noreturn void __libc_fatal(const char* _Nonnull, ...) __printflike(1, 2);
