summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libc/Android.mk1
-rw-r--r--libc/bionic/pthread_internal.h7
-rw-r--r--libc/upstream-netbsd/android/include/netbsd-compat.h3
-rw-r--r--libc/upstream-netbsd/lib/libc/regex/regcomp.c81
-rw-r--r--libc/upstream-netbsd/lib/libc/stdlib/reallocarr.c95
-rw-r--r--libc/zoneinfo/tzdatabin491816 -> 494261 bytes
-rw-r--r--linker/linker.cpp16
-rw-r--r--tests/libs/Android.mk2
-rw-r--r--tests/pthread_test.cpp24
-rw-r--r--tests/stack_unwinding_test.cpp2
10 files changed, 176 insertions, 55 deletions
diff --git a/libc/Android.mk b/libc/Android.mk
index b50717d..f0c5e9f 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -309,6 +309,7 @@ libc_upstream_netbsd_src_files := \
upstream-netbsd/lib/libc/stdlib/nrand48.c \
upstream-netbsd/lib/libc/stdlib/_rand48.c \
upstream-netbsd/lib/libc/stdlib/rand_r.c \
+ upstream-netbsd/lib/libc/stdlib/reallocarr.c \
upstream-netbsd/lib/libc/stdlib/seed48.c \
upstream-netbsd/lib/libc/stdlib/srand48.c \
upstream-netbsd/lib/libc/string/memccpy.c \
diff --git a/libc/bionic/pthread_internal.h b/libc/bionic/pthread_internal.h
index 3b91e6a..6a39a21 100644
--- a/libc/bionic/pthread_internal.h
+++ b/libc/bionic/pthread_internal.h
@@ -130,8 +130,13 @@ __LIBC_HIDDEN__ void pthread_key_clean_all(void);
*/
#define PTHREAD_STACK_SIZE_DEFAULT ((1 * 1024 * 1024) - SIGSTKSZ)
-/* Leave room for a guard page in the internally created signal stacks. */
+// Leave room for a guard page in the internally created signal stacks.
+#if defined(__LP64__)
+// SIGSTKSZ is not big enough for 64-bit arch. See http://b/23041777.
+#define SIGNAL_STACK_SIZE (16 * 1024 + PAGE_SIZE)
+#else
#define SIGNAL_STACK_SIZE (SIGSTKSZ + PAGE_SIZE)
+#endif
/* Needed by fork. */
__LIBC_HIDDEN__ extern void __bionic_atfork_run_prepare();
diff --git a/libc/upstream-netbsd/android/include/netbsd-compat.h b/libc/upstream-netbsd/android/include/netbsd-compat.h
index 04bc728..0212d16 100644
--- a/libc/upstream-netbsd/android/include/netbsd-compat.h
+++ b/libc/upstream-netbsd/android/include/netbsd-compat.h
@@ -31,4 +31,7 @@
#define __readlockenv() 0
#define __unlockenv() 0
+#include <stddef.h>
+int reallocarr(void*, size_t, size_t);
+
#endif
diff --git a/libc/upstream-netbsd/lib/libc/regex/regcomp.c b/libc/upstream-netbsd/lib/libc/regex/regcomp.c
index 2644a22..6af9734 100644
--- a/libc/upstream-netbsd/lib/libc/regex/regcomp.c
+++ b/libc/upstream-netbsd/lib/libc/regex/regcomp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: regcomp.c,v 1.33 2012/03/13 21:13:43 christos Exp $ */
+/* $NetBSD: regcomp.c,v 1.36 2015/09/12 19:08:47 christos Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -76,7 +76,7 @@
#if 0
static char sccsid[] = "@(#)regcomp.c 8.5 (Berkeley) 3/20/94";
#else
-__RCSID("$NetBSD: regcomp.c,v 1.33 2012/03/13 21:13:43 christos Exp $");
+__RCSID("$NetBSD: regcomp.c,v 1.36 2015/09/12 19:08:47 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -262,12 +262,11 @@ regcomp(
len = strlen(pattern);
/* do the mallocs early so failure handling is easy */
- g = (struct re_guts *)malloc(sizeof(struct re_guts) +
- (NC-1)*sizeof(cat_t));
+ g = malloc(sizeof(struct re_guts) + (NC - 1) * sizeof(cat_t));
if (g == NULL)
return(REG_ESPACE);
p->ssize = len/(size_t)2*(size_t)3 + (size_t)1; /* ugh */
- p->strip = malloc(p->ssize * sizeof(sop));
+ p->strip = calloc(p->ssize, sizeof(sop));
p->slen = 0;
if (p->strip == NULL) {
free(g);
@@ -1075,19 +1074,19 @@ ordinary(
int ch)
{
cat_t *cap;
+ unsigned char uc = (unsigned char)ch;
_DIAGASSERT(p != NULL);
cap = p->g->categories;
- if ((p->g->cflags&REG_ICASE) && isalpha((unsigned char) ch)
- && othercase((unsigned char) ch) != (unsigned char) ch)
- bothcases(p, (unsigned char) ch);
+ if ((p->g->cflags & REG_ICASE) && isalpha(uc) && othercase(uc) != uc)
+ bothcases(p, uc);
else {
- EMIT(OCHAR, (sopno)(unsigned char)ch);
- if (cap[ch] == 0) {
+ EMIT(OCHAR, (sopno)uc);
+ if (cap[uc] == 0) {
_DIAGASSERT(__type_fit(unsigned char,
p->g->ncategories + 1));
- cap[ch] = (unsigned char)p->g->ncategories++;
+ cap[uc] = (unsigned char)p->g->ncategories++;
}
}
}
@@ -1236,6 +1235,7 @@ allocset(
cset *cs;
size_t css;
size_t i;
+ void *old_ptr;
_DIAGASSERT(p != NULL);
@@ -1248,28 +1248,18 @@ allocset(
nbytes = nc / CHAR_BIT * css;
if (MEMSIZE(p) > MEMLIMIT)
goto oomem;
- if (p->g->sets == NULL)
- p->g->sets = malloc(nc * sizeof(cset));
- else
- p->g->sets = realloc(p->g->sets, nc * sizeof(cset));
- if (p->g->setbits == NULL)
- p->g->setbits = malloc(nbytes);
- else {
- p->g->setbits = realloc(p->g->setbits, nbytes);
- /* xxx this isn't right if setbits is now NULL */
+ if (reallocarr(&p->g->sets, nc, sizeof(cset)))
+ goto oomem;
+ old_ptr = p->g->setbits;
+ if (reallocarr(&p->g->setbits, nc / CHAR_BIT, css)) {
+ free(old_ptr);
+ goto oomem;
+ }
+ if (old_ptr != p->g->setbits) {
for (i = 0; i < no; i++)
p->g->sets[i].ptr = p->g->setbits + css*(i/CHAR_BIT);
}
- if (p->g->sets != NULL && p->g->setbits != NULL)
- (void) memset((char *)p->g->setbits + (nbytes - css),
- 0, css);
- else {
-oomem:
- no = 0;
- SETERROR(REG_ESPACE);
- /* caller's responsibility not to do set ops */
- return NULL;
- }
+ (void) memset((char *)p->g->setbits + (nbytes - css), 0, css);
}
cs = &p->g->sets[no];
@@ -1280,6 +1270,11 @@ oomem:
cs->multis = NULL;
return(cs);
+
+oomem:
+ SETERROR(REG_ESPACE);
+ /* caller's responsibility not to do set ops */
+ return NULL;
}
/*
@@ -1763,30 +1758,18 @@ dofwd(
== static void enlarge(struct parse *p, sopno size);
*/
static int
-enlarge(
- struct parse *p,
- sopno size)
+enlarge(struct parse *p, sopno size)
{
- sop *sp;
- sopno osize;
-
_DIAGASSERT(p != NULL);
if (p->ssize >= size)
return 1;
- osize = p->ssize;
- p->ssize = size;
- if (MEMSIZE(p) > MEMLIMIT)
- goto oomem;
- sp = realloc(p->strip, p->ssize * sizeof(sop));
- if (sp == NULL) {
-oomem:
- p->ssize = osize;
+ if (MEMSIZE(p) > MEMLIMIT || reallocarr(&p->strip, size, sizeof(sop))) {
SETERROR(REG_ESPACE);
return 0;
}
- p->strip = sp;
+ p->ssize = size;
return 1;
}
@@ -1804,11 +1787,9 @@ stripsnug(
_DIAGASSERT(g != NULL);
g->nstates = p->slen;
- g->strip = realloc(p->strip, p->slen * sizeof(sop));
- if (g->strip == NULL) {
- SETERROR(REG_ESPACE);
- g->strip = p->strip;
- }
+ g->strip = p->strip;
+ reallocarr(&g->strip, p->slen, sizeof(sop));
+ /* Ignore error as tries to free memory only. */
}
/*
diff --git a/libc/upstream-netbsd/lib/libc/stdlib/reallocarr.c b/libc/upstream-netbsd/lib/libc/stdlib/reallocarr.c
new file mode 100644
index 0000000..6ffe811
--- /dev/null
+++ b/libc/upstream-netbsd/lib/libc/stdlib/reallocarr.c
@@ -0,0 +1,95 @@
+/* $NetBSD: reallocarr.c,v 1.5 2015/08/20 22:27:49 kamil Exp $ */
+
+/*-
+ * Copyright (c) 2015 Joerg Sonnenberger <joerg@NetBSD.org>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. 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 HOLDERS 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.
+ */
+
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: reallocarr.c,v 1.5 2015/08/20 22:27:49 kamil Exp $");
+
+#include "namespace.h"
+#include <errno.h>
+/* Old POSIX has SIZE_MAX in limits.h */
+#include <limits.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef _LIBC
+#ifdef __weak_alias
+__weak_alias(reallocarr, _reallocarr)
+#endif
+#endif
+
+#define SQRT_SIZE_MAX (((size_t)1) << (sizeof(size_t) * CHAR_BIT / 2))
+
+#if !HAVE_REALLOCARR
+int
+reallocarr(void *ptr, size_t number, size_t size)
+{
+ int saved_errno, result;
+ void *optr;
+ void *nptr;
+
+ saved_errno = errno;
+ memcpy(&optr, ptr, sizeof(ptr));
+ if (number == 0 || size == 0) {
+ free(optr);
+ nptr = NULL;
+ memcpy(ptr, &nptr, sizeof(ptr));
+ errno = saved_errno;
+ return 0;
+ }
+
+ /*
+ * Try to avoid division here.
+ *
+ * It isn't possible to overflow during multiplication if neither
+ * operand uses any of the most significant half of the bits.
+ */
+ if (__predict_false((number|size) >= SQRT_SIZE_MAX &&
+ number > SIZE_MAX / size)) {
+ errno = saved_errno;
+ return EOVERFLOW;
+ }
+
+ nptr = realloc(optr, number * size);
+ if (__predict_false(nptr == NULL)) {
+ result = errno;
+ } else {
+ result = 0;
+ memcpy(ptr, &nptr, sizeof(ptr));
+ }
+ errno = saved_errno;
+ return result;
+}
+#endif
diff --git a/libc/zoneinfo/tzdata b/libc/zoneinfo/tzdata
index f22464e..c464f46 100644
--- a/libc/zoneinfo/tzdata
+++ b/libc/zoneinfo/tzdata
Binary files differ
diff --git a/linker/linker.cpp b/linker/linker.cpp
index b860f70..d3ac1d0 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -37,6 +37,7 @@
#include <string.h>
#include <sys/mman.h>
#include <sys/param.h>
+#include <sys/prctl.h>
#include <unistd.h>
#include <new>
@@ -317,6 +318,13 @@ static void parse_LD_PRELOAD(const char* path) {
static bool realpath_fd(int fd, std::string* realpath) {
std::vector<char> buf(PATH_MAX), proc_self_fd(PATH_MAX);
snprintf(&proc_self_fd[0], proc_self_fd.size(), "/proc/self/fd/%d", fd);
+ // set DUMPABLE to 1 to access /proc/self/fd
+ int dumpable = prctl(PR_GET_DUMPABLE, 0, 0, 0, 0);
+ prctl(PR_SET_DUMPABLE, 1, 0, 0, 0);
+ auto guard = make_scope_guard([&]() {
+ // restore dumpable
+ prctl(PR_SET_DUMPABLE, dumpable, 0, 0, 0);
+ });
if (readlink(&proc_self_fd[0], &buf[0], buf.size()) == -1) {
PRINT("readlink('%s') failed: %s [fd=%d]", &proc_self_fd[0], strerror(errno), fd);
return false;
@@ -1468,13 +1476,14 @@ static bool find_libraries(soinfo* start_with, const char* const library_names[]
// Step 1: load and pre-link all DT_NEEDED libraries in breadth first order.
for (LoadTask::unique_ptr task(load_tasks.pop_front());
task.get() != nullptr; task.reset(load_tasks.pop_front())) {
- soinfo* si = find_library_internal(load_tasks, task->get_name(), rtld_flags, extinfo);
+ soinfo* needed_by = task->get_needed_by();
+
+ soinfo* si = find_library_internal(load_tasks, task->get_name(),
+ rtld_flags, needed_by == nullptr ? extinfo : nullptr);
if (si == nullptr) {
return false;
}
- soinfo* needed_by = task->get_needed_by();
-
if (needed_by != nullptr) {
needed_by->add_child(si);
}
@@ -2936,6 +2945,7 @@ bool soinfo::link_image(const soinfo_list_t& global_group, const soinfo_list_t&
// TODO (dimitry): remove != __ANDROID_API__ check once http://b/20020312 is fixed
if (get_application_target_sdk_version() != __ANDROID_API__
&& get_application_target_sdk_version() > 22) {
+ PRINT("%s: has text relocations", get_realpath());
DL_ERR("%s: has text relocations", get_realpath());
return false;
}
diff --git a/tests/libs/Android.mk b/tests/libs/Android.mk
index a5ef622..5b96306 100644
--- a/tests/libs/Android.mk
+++ b/tests/libs/Android.mk
@@ -67,6 +67,8 @@ libdlext_test_src_files := \
libdlext_test_ldflags := \
-Wl,-z,relro \
+libdlext_test_shared_libraries := libtest_simple
+
module := libdlext_test
module_tag := optional
include $(LOCAL_PATH)/Android.build.testlib.mk
diff --git a/tests/pthread_test.cpp b/tests/pthread_test.cpp
index 8ae28d8..ad8fac6 100644
--- a/tests/pthread_test.cpp
+++ b/tests/pthread_test.cpp
@@ -27,6 +27,7 @@
#include <sys/syscall.h>
#include <time.h>
#include <unistd.h>
+#include <unwind.h>
#include <atomic>
#include <regex>
@@ -1571,3 +1572,26 @@ TEST_F(pthread_DeathTest, pthread_mutex_unlock_null_64) {
GTEST_LOG_(INFO) << "This test tests bionic implementation details on 64 bit devices.";
#endif
}
+
+extern _Unwind_Reason_Code FrameCounter(_Unwind_Context* ctx, void* arg);
+
+static volatile bool signal_handler_on_altstack_done;
+
+static void SignalHandlerOnAltStack(int signo, siginfo_t*, void*) {
+ ASSERT_EQ(SIGUSR1, signo);
+ // Check if we have enough stack space for unwinding.
+ int count = 0;
+ _Unwind_Backtrace(FrameCounter, &count);
+ ASSERT_GT(count, 0);
+ // Check if we have enough stack space for logging.
+ std::string s(2048, '*');
+ GTEST_LOG_(INFO) << s;
+ signal_handler_on_altstack_done = true;
+}
+
+TEST(pthread, big_enough_signal_stack_for_64bit_arch) {
+ signal_handler_on_altstack_done = false;
+ ScopedSignalHandler handler(SIGUSR1, SignalHandlerOnAltStack, SA_SIGINFO | SA_ONSTACK);
+ kill(getpid(), SIGUSR1);
+ ASSERT_TRUE(signal_handler_on_altstack_done);
+}
diff --git a/tests/stack_unwinding_test.cpp b/tests/stack_unwinding_test.cpp
index d1b3402..afd9e7f 100644
--- a/tests/stack_unwinding_test.cpp
+++ b/tests/stack_unwinding_test.cpp
@@ -34,7 +34,7 @@
#define noinline __attribute__((__noinline__))
#define __unused __attribute__((__unused__))
-static _Unwind_Reason_Code FrameCounter(_Unwind_Context* ctx __unused, void* arg) {
+_Unwind_Reason_Code FrameCounter(_Unwind_Context* ctx __unused, void* arg) {
int* count_ptr = reinterpret_cast<int*>(arg);
#if SHOW_FRAME_LOCATIONS
generated by cgit v1.1 at 2024-12-22 09:39:55 +0000