eb847bc866
The x86_64 build was failing because clone.S had a call to __thread_entry which was being added to a different intermediate .a on the way to making libc.so, and the linker couldn't guarantee statically that such a relocation would be possible. ld: error: out/target/product/generic_x86_64/obj/STATIC_LIBRARIES/libc_common_intermediates/libc_common.a(clone.o): requires dynamic R_X86_64_PC32 reloc against '__thread_entry' which may overflow at runtime; recompile with -fPIC This patch addresses that by ensuring that the caller and callee end up in the same intermediate .a. While I'm here, I've tried to clean up some of the mess that led to this situation too. In particular, this removes libc/private/ from the default include path (except for the DNS code), and splits out the DNS code into its own library (since it's a weird special case of upstream NetBSD code that's diverged so heavily it's unlikely ever to get back in sync). There's more cleanup of the DNS situation possible, but this is definitely a step in the right direction, and it's more than enough to get x86_64 building cleanly. Change-Id: I00425a7245b7a2573df16cc38798187d0729e7c4
559 lines
15 KiB
C++
559 lines
15 KiB
C++
/*
|
|
* Copyright (C) 2010 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 "../private/libc_logging.h" // Relative path so we can #include this .cpp file for testing.
|
|
#include "../private/ScopedPthreadMutexLocker.h"
|
|
|
|
#include <assert.h>
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <pthread.h>
|
|
#include <stdarg.h>
|
|
#include <stddef.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <sys/mman.h>
|
|
#include <sys/uio.h>
|
|
#include <unistd.h>
|
|
|
|
static pthread_mutex_t gAbortMsgLock = 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,
|
|
EVENT_TYPE_LONG = 1,
|
|
EVENT_TYPE_STRING = 2,
|
|
EVENT_TYPE_LIST = 3,
|
|
};
|
|
|
|
struct BufferOutputStream {
|
|
public:
|
|
BufferOutputStream(char* buffer, size_t size) : total(0) {
|
|
buffer_ = buffer;
|
|
end_ = buffer + size - 1;
|
|
pos_ = buffer_;
|
|
pos_[0] = '\0';
|
|
}
|
|
|
|
~BufferOutputStream() {
|
|
}
|
|
|
|
void Send(const char* data, int len) {
|
|
if (len < 0) {
|
|
len = strlen(data);
|
|
}
|
|
|
|
while (len > 0) {
|
|
int avail = end_ - pos_;
|
|
if (avail == 0) {
|
|
break;
|
|
}
|
|
if (avail > len) {
|
|
avail = len;
|
|
}
|
|
memcpy(pos_, data, avail);
|
|
pos_ += avail;
|
|
pos_[0] = '\0';
|
|
len -= avail;
|
|
total += avail;
|
|
}
|
|
}
|
|
|
|
int total;
|
|
|
|
private:
|
|
char* buffer_;
|
|
char* pos_;
|
|
char* end_;
|
|
};
|
|
|
|
struct FdOutputStream {
|
|
public:
|
|
FdOutputStream(int fd) : total(0), fd_(fd) {
|
|
}
|
|
|
|
void Send(const char* data, int len) {
|
|
if (len < 0) {
|
|
len = strlen(data);
|
|
}
|
|
|
|
while (len > 0) {
|
|
int rc = TEMP_FAILURE_RETRY(write(fd_, data, len));
|
|
if (rc == -1) {
|
|
break;
|
|
}
|
|
data += rc;
|
|
len -= rc;
|
|
total += rc;
|
|
}
|
|
}
|
|
|
|
int total;
|
|
|
|
private:
|
|
int fd_;
|
|
};
|
|
|
|
/*** formatted output implementation
|
|
***/
|
|
|
|
/* Parse a decimal string from 'format + *ppos',
|
|
* return the value, and writes the new position past
|
|
* the decimal string in '*ppos' on exit.
|
|
*
|
|
* NOTE: Does *not* handle a sign prefix.
|
|
*/
|
|
static unsigned parse_decimal(const char *format, int *ppos) {
|
|
const char* p = format + *ppos;
|
|
unsigned result = 0;
|
|
|
|
for (;;) {
|
|
int ch = *p;
|
|
unsigned d = (unsigned)(ch - '0');
|
|
|
|
if (d >= 10U) {
|
|
break;
|
|
}
|
|
|
|
result = result*10 + d;
|
|
p++;
|
|
}
|
|
*ppos = p - format;
|
|
return result;
|
|
}
|
|
|
|
// Writes number 'value' in base 'base' into buffer 'buf' of size 'buf_size' bytes.
|
|
// Assumes that buf_size > 0.
|
|
static void format_unsigned(char* buf, size_t buf_size, uint64_t value, int base, bool caps) {
|
|
char* p = buf;
|
|
char* end = buf + buf_size - 1;
|
|
|
|
// Generate digit string in reverse order.
|
|
while (value) {
|
|
unsigned d = value % base;
|
|
value /= base;
|
|
if (p != end) {
|
|
char ch;
|
|
if (d < 10) {
|
|
ch = '0' + d;
|
|
} else {
|
|
ch = (caps ? 'A' : 'a') + (d - 10);
|
|
}
|
|
*p++ = ch;
|
|
}
|
|
}
|
|
|
|
// Special case for 0.
|
|
if (p == buf) {
|
|
if (p != end) {
|
|
*p++ = '0';
|
|
}
|
|
}
|
|
*p = '\0';
|
|
|
|
// Reverse digit string in-place.
|
|
size_t length = p - buf;
|
|
for (size_t i = 0, j = length - 1; i < j; ++i, --j) {
|
|
char ch = buf[i];
|
|
buf[i] = buf[j];
|
|
buf[j] = ch;
|
|
}
|
|
}
|
|
|
|
static void format_integer(char* buf, size_t buf_size, uint64_t value, char conversion) {
|
|
// Decode the conversion specifier.
|
|
int is_signed = (conversion == 'd' || conversion == 'i' || conversion == 'o');
|
|
int base = 10;
|
|
if (conversion == 'x' || conversion == 'X') {
|
|
base = 16;
|
|
} else if (conversion == 'o') {
|
|
base = 8;
|
|
}
|
|
bool caps = (conversion == 'X');
|
|
|
|
if (is_signed && static_cast<int64_t>(value) < 0) {
|
|
buf[0] = '-';
|
|
buf += 1;
|
|
buf_size -= 1;
|
|
value = static_cast<uint64_t>(-static_cast<int64_t>(value));
|
|
}
|
|
format_unsigned(buf, buf_size, value, base, caps);
|
|
}
|
|
|
|
template <typename Out>
|
|
static void SendRepeat(Out& o, char ch, int count) {
|
|
char pad[8];
|
|
memset(pad, ch, sizeof(pad));
|
|
|
|
const int pad_size = static_cast<int>(sizeof(pad));
|
|
while (count > 0) {
|
|
int avail = count;
|
|
if (avail > pad_size) {
|
|
avail = pad_size;
|
|
}
|
|
o.Send(pad, avail);
|
|
count -= avail;
|
|
}
|
|
}
|
|
|
|
/* Perform formatted output to an output target 'o' */
|
|
template <typename Out>
|
|
static void out_vformat(Out& o, const char* format, va_list args) {
|
|
int nn = 0;
|
|
|
|
for (;;) {
|
|
int mm;
|
|
int padZero = 0;
|
|
int padLeft = 0;
|
|
char sign = '\0';
|
|
int width = -1;
|
|
int prec = -1;
|
|
size_t bytelen = sizeof(int);
|
|
int slen;
|
|
char buffer[32]; /* temporary buffer used to format numbers */
|
|
|
|
char c;
|
|
|
|
/* first, find all characters that are not 0 or '%' */
|
|
/* then send them to the output directly */
|
|
mm = nn;
|
|
do {
|
|
c = format[mm];
|
|
if (c == '\0' || c == '%')
|
|
break;
|
|
mm++;
|
|
} while (1);
|
|
|
|
if (mm > nn) {
|
|
o.Send(format+nn, mm-nn);
|
|
nn = mm;
|
|
}
|
|
|
|
/* is this it ? then exit */
|
|
if (c == '\0')
|
|
break;
|
|
|
|
/* nope, we are at a '%' modifier */
|
|
nn++; // skip it
|
|
|
|
/* parse flags */
|
|
for (;;) {
|
|
c = format[nn++];
|
|
if (c == '\0') { /* single trailing '%' ? */
|
|
c = '%';
|
|
o.Send(&c, 1);
|
|
return;
|
|
}
|
|
else if (c == '0') {
|
|
padZero = 1;
|
|
continue;
|
|
}
|
|
else if (c == '-') {
|
|
padLeft = 1;
|
|
continue;
|
|
}
|
|
else if (c == ' ' || c == '+') {
|
|
sign = c;
|
|
continue;
|
|
}
|
|
break;
|
|
}
|
|
|
|
/* parse field width */
|
|
if ((c >= '0' && c <= '9')) {
|
|
nn --;
|
|
width = (int)parse_decimal(format, &nn);
|
|
c = format[nn++];
|
|
}
|
|
|
|
/* parse precision */
|
|
if (c == '.') {
|
|
prec = (int)parse_decimal(format, &nn);
|
|
c = format[nn++];
|
|
}
|
|
|
|
/* length modifier */
|
|
switch (c) {
|
|
case 'h':
|
|
bytelen = sizeof(short);
|
|
if (format[nn] == 'h') {
|
|
bytelen = sizeof(char);
|
|
nn += 1;
|
|
}
|
|
c = format[nn++];
|
|
break;
|
|
case 'l':
|
|
bytelen = sizeof(long);
|
|
if (format[nn] == 'l') {
|
|
bytelen = sizeof(long long);
|
|
nn += 1;
|
|
}
|
|
c = format[nn++];
|
|
break;
|
|
case 'z':
|
|
bytelen = sizeof(size_t);
|
|
c = format[nn++];
|
|
break;
|
|
case 't':
|
|
bytelen = sizeof(ptrdiff_t);
|
|
c = format[nn++];
|
|
break;
|
|
default:
|
|
;
|
|
}
|
|
|
|
/* conversion specifier */
|
|
const char* str = buffer;
|
|
if (c == 's') {
|
|
/* string */
|
|
str = va_arg(args, const char*);
|
|
if (str == NULL) {
|
|
str = "(null)";
|
|
}
|
|
} else if (c == 'c') {
|
|
/* character */
|
|
/* NOTE: char is promoted to int when passed through the stack */
|
|
buffer[0] = (char) va_arg(args, int);
|
|
buffer[1] = '\0';
|
|
} else if (c == 'p') {
|
|
uint64_t value = (uintptr_t) va_arg(args, void*);
|
|
buffer[0] = '0';
|
|
buffer[1] = 'x';
|
|
format_integer(buffer + 2, sizeof(buffer) - 2, value, 'x');
|
|
} else if (c == 'd' || c == 'i' || c == 'o' || c == 'u' || c == 'x' || c == 'X') {
|
|
/* integers - first read value from stack */
|
|
uint64_t value;
|
|
int is_signed = (c == 'd' || c == 'i' || c == 'o');
|
|
|
|
/* NOTE: int8_t and int16_t are promoted to int when passed
|
|
* through the stack
|
|
*/
|
|
switch (bytelen) {
|
|
case 1: value = (uint8_t) va_arg(args, int); break;
|
|
case 2: value = (uint16_t) va_arg(args, int); break;
|
|
case 4: value = va_arg(args, uint32_t); break;
|
|
case 8: value = va_arg(args, uint64_t); break;
|
|
default: return; /* should not happen */
|
|
}
|
|
|
|
/* sign extension, if needed */
|
|
if (is_signed) {
|
|
int shift = 64 - 8*bytelen;
|
|
value = (uint64_t)(((int64_t)(value << shift)) >> shift);
|
|
}
|
|
|
|
/* format the number properly into our buffer */
|
|
format_integer(buffer, sizeof(buffer), value, c);
|
|
} else if (c == '%') {
|
|
buffer[0] = '%';
|
|
buffer[1] = '\0';
|
|
} else {
|
|
__assert(__FILE__, __LINE__, "conversion specifier unsupported");
|
|
}
|
|
|
|
/* if we are here, 'str' points to the content that must be
|
|
* outputted. handle padding and alignment now */
|
|
|
|
slen = strlen(str);
|
|
|
|
if (sign != '\0' || prec != -1) {
|
|
__assert(__FILE__, __LINE__, "sign/precision unsupported");
|
|
}
|
|
|
|
if (slen < width && !padLeft) {
|
|
char padChar = padZero ? '0' : ' ';
|
|
SendRepeat(o, padChar, width - slen);
|
|
}
|
|
|
|
o.Send(str, slen);
|
|
|
|
if (slen < width && padLeft) {
|
|
char padChar = padZero ? '0' : ' ';
|
|
SendRepeat(o, padChar, width - slen);
|
|
}
|
|
}
|
|
}
|
|
|
|
int __libc_format_buffer(char* buffer, size_t buffer_size, const char* format, ...) {
|
|
BufferOutputStream os(buffer, buffer_size);
|
|
va_list args;
|
|
va_start(args, format);
|
|
out_vformat(os, format, args);
|
|
va_end(args);
|
|
return os.total;
|
|
}
|
|
|
|
int __libc_format_fd(int fd, const char* format, ...) {
|
|
FdOutputStream os(fd);
|
|
va_list args;
|
|
va_start(args, format);
|
|
out_vformat(os, format, args);
|
|
va_end(args);
|
|
return os.total;
|
|
}
|
|
|
|
static int __libc_write_stderr(const char* tag, const char* msg) {
|
|
int fd = TEMP_FAILURE_RETRY(open("/dev/stderr", O_CLOEXEC | O_WRONLY));
|
|
if (fd == -1) {
|
|
return -1;
|
|
}
|
|
|
|
iovec vec[4];
|
|
vec[0].iov_base = const_cast<char*>(tag);
|
|
vec[0].iov_len = strlen(tag);
|
|
vec[1].iov_base = const_cast<char*>(": ");
|
|
vec[1].iov_len = 2;
|
|
vec[2].iov_base = const_cast<char*>(msg);
|
|
vec[2].iov_len = strlen(msg) + 1;
|
|
vec[3].iov_base = const_cast<char*>("\n");
|
|
vec[3].iov_len = 1;
|
|
|
|
int result = TEMP_FAILURE_RETRY(writev(fd, vec, 4));
|
|
close(fd);
|
|
return result;
|
|
}
|
|
|
|
static int __libc_write_log(int priority, const char* tag, const char* msg) {
|
|
int main_log_fd = TEMP_FAILURE_RETRY(open("/dev/log/main", O_CLOEXEC | O_WRONLY));
|
|
if (main_log_fd == -1) {
|
|
if (errno == ENOTDIR) {
|
|
// /dev/log isn't a directory? Maybe we're running on the host? Try stderr instead.
|
|
return __libc_write_stderr(tag, msg);
|
|
}
|
|
return -1;
|
|
}
|
|
|
|
iovec vec[3];
|
|
vec[0].iov_base = &priority;
|
|
vec[0].iov_len = 1;
|
|
vec[1].iov_base = const_cast<char*>(tag);
|
|
vec[1].iov_len = strlen(tag) + 1;
|
|
vec[2].iov_base = const_cast<char*>(msg);
|
|
vec[2].iov_len = strlen(msg) + 1;
|
|
|
|
int result = TEMP_FAILURE_RETRY(writev(main_log_fd, vec, 3));
|
|
close(main_log_fd);
|
|
return result;
|
|
}
|
|
|
|
int __libc_format_log_va_list(int priority, const char* tag, const char* format, va_list args) {
|
|
char buffer[1024];
|
|
BufferOutputStream os(buffer, sizeof(buffer));
|
|
out_vformat(os, format, args);
|
|
return __libc_write_log(priority, tag, buffer);
|
|
}
|
|
|
|
int __libc_format_log(int priority, const char* tag, const char* format, ...) {
|
|
va_list args;
|
|
va_start(args, format);
|
|
int result = __libc_format_log_va_list(priority, tag, format, args);
|
|
va_end(args);
|
|
return result;
|
|
}
|
|
|
|
static int __libc_android_log_event(int32_t tag, char type, const void* payload, size_t len) {
|
|
iovec vec[3];
|
|
vec[0].iov_base = &tag;
|
|
vec[0].iov_len = sizeof(tag);
|
|
vec[1].iov_base = &type;
|
|
vec[1].iov_len = sizeof(type);
|
|
vec[2].iov_base = const_cast<void*>(payload);
|
|
vec[2].iov_len = len;
|
|
|
|
int event_log_fd = TEMP_FAILURE_RETRY(open("/dev/log/events", O_CLOEXEC | O_WRONLY));
|
|
if (event_log_fd == -1) {
|
|
return -1;
|
|
}
|
|
int result = TEMP_FAILURE_RETRY(writev(event_log_fd, vec, 3));
|
|
close(event_log_fd);
|
|
return result;
|
|
}
|
|
|
|
void __libc_android_log_event_int(int32_t tag, int value) {
|
|
__libc_android_log_event(tag, EVENT_TYPE_INT, &value, sizeof(value));
|
|
}
|
|
|
|
void __libc_android_log_event_uid(int32_t tag) {
|
|
__libc_android_log_event_int(tag, getuid());
|
|
}
|
|
|
|
void __fortify_chk_fail(const char *msg, uint32_t tag) {
|
|
if (tag != 0) {
|
|
__libc_android_log_event_uid(tag);
|
|
}
|
|
__libc_fatal("FORTIFY_SOURCE: %s. Calling abort().", msg);
|
|
}
|
|
|
|
static void __libc_fatal(const char* format, va_list args) {
|
|
char msg[1024];
|
|
BufferOutputStream os(msg, sizeof(msg));
|
|
out_vformat(os, format, args);
|
|
|
|
// TODO: log to stderr for the benefit of "adb shell" users.
|
|
|
|
// Log to the log for the benefit of regular app developers (whose stdout and stderr are closed).
|
|
__libc_write_log(ANDROID_LOG_FATAL, "libc", msg);
|
|
|
|
__libc_set_abort_message(msg);
|
|
}
|
|
|
|
void __libc_fatal_no_abort(const char* format, ...) {
|
|
va_list args;
|
|
va_start(args, format);
|
|
__libc_fatal(format, args);
|
|
va_end(args);
|
|
}
|
|
|
|
void __libc_fatal(const char* format, ...) {
|
|
va_list args;
|
|
va_start(args, format);
|
|
__libc_fatal(format, args);
|
|
va_end(args);
|
|
abort();
|
|
}
|
|
|
|
void __libc_set_abort_message(const char* msg) {
|
|
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;
|
|
}
|
|
|
|
if (__abort_message_ptr != NULL) {
|
|
ScopedPthreadMutexLocker locker(&gAbortMsgLock);
|
|
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;
|
|
}
|
|
}
|