OSDN Git Service
Elliott Hughes [Mon, 20 Jul 2015 18:44:55 +0000 (18:44 +0000)]
am
6c9ad82b: Merge "Revert "make vdso function pointers read-only at runtime""
* commit '
6c9ad82b1c0f26f5edb5d5ca246b88451c5ea238':
Revert "make vdso function pointers read-only at runtime"
Elliott Hughes [Mon, 20 Jul 2015 17:30:49 +0000 (17:30 +0000)]
Merge "Revert "make vdso function pointers read-only at runtime""
Elliott Hughes [Mon, 20 Jul 2015 17:30:33 +0000 (17:30 +0000)]
Revert "make vdso function pointers read-only at runtime"
This reverts commit
df1a3c6d21702e3e96cfcddadee4a50bfac82110.
This change prevented N9 from booting (http://b/
22568628).
Change-Id: I071d6d6a0ae7881d65641839e665acdcf58462b4
Elliott Hughes [Fri, 17 Jul 2015 22:04:59 +0000 (22:04 +0000)]
am
4f2e1d3b: Merge "Add all the glibc one-line "synonym" header files."
* commit '
4f2e1d3b1e3b3729b551c22c5a0be8d07795adfd':
Add all the glibc one-line "synonym" header files.
Elliott Hughes [Fri, 17 Jul 2015 21:42:03 +0000 (21:42 +0000)]
Merge "Add all the glibc one-line "synonym" header files."
Elliott Hughes [Fri, 17 Jul 2015 20:59:36 +0000 (13:59 -0700)]
Add all the glibc one-line "synonym" header files.
Ported code keeps needing these one by one, so let's just add the whole
set...
Change-Id: I9662b256aeaa1b0ffb22354130e503f0c4aa472b
Elliott Hughes [Fri, 17 Jul 2015 18:39:31 +0000 (18:39 +0000)]
am
ca7bc509: Merge "make vdso function pointers read-only at runtime"
* commit '
ca7bc509cf3b321b4721137df1e5407415fc7dd7':
make vdso function pointers read-only at runtime
Dmitriy Ivanov [Fri, 17 Jul 2015 18:17:06 +0000 (18:17 +0000)]
am
a58d2498: Merge "Fix potential race condition on dlopen"
* commit '
a58d24984045b474883ad14500a465ab331db47d':
Fix potential race condition on dlopen
Elliott Hughes [Fri, 17 Jul 2015 18:13:31 +0000 (18:13 +0000)]
Merge "make vdso function pointers read-only at runtime"
Daniel Micay [Fri, 17 Jul 2015 16:13:27 +0000 (12:13 -0400)]
make vdso function pointers read-only at runtime
Global, writable function pointers are low-hanging fruit for hijacking
control flow with an overflow from a global buffer or an arbitrary write
vulnerability. This moves the function pointer table into a dedicated
page and makes it read-only at runtime, similar to RELRO.
This increases the memory usage of the library by just under one page.
This could be avoided by having the linker load the vdso by replacing
weak symbols. It's not significant within the Zygote spawning model
though because it's read-only after early init.
Change-Id: Id7a49c96c1b15c2e1926528304b3c54a81e78caf
Dmitriy Ivanov [Fri, 17 Jul 2015 17:49:20 +0000 (17:49 +0000)]
Merge "Fix potential race condition on dlopen"
Dmitriy Ivanov [Fri, 17 Jul 2015 17:36:10 +0000 (10:36 -0700)]
Fix potential race condition on dlopen
Call to find_containing_library should be guarded.
Change-Id: I985a903da48b83bcd35e957a979158eb9b80e70b
Bertrand SIMONNET [Thu, 16 Jul 2015 22:27:51 +0000 (22:27 +0000)]
am
60bc9090: Merge "Add timespec/timeval conversion helpers."
* commit '
60bc90909a49121789bf86f5d14f63967e8000e0':
Add timespec/timeval conversion helpers.
Bertrand SIMONNET [Thu, 16 Jul 2015 21:53:25 +0000 (21:53 +0000)]
Merge "Add timespec/timeval conversion helpers."
Bertrand SIMONNET [Thu, 16 Jul 2015 18:50:39 +0000 (11:50 -0700)]
Add timespec/timeval conversion helpers.
TIMESPEC_TO_TIMEVAL and TIMEVAL_TO_TIMESPEC are usually provided by
sys/time.h.
BUG:
22532790
Change-Id: I8b9d7298e3250323faa20b1adf9a7514954c6096
Dmitriy Ivanov [Thu, 16 Jul 2015 16:26:33 +0000 (16:26 +0000)]
am
cd588f84: Merge "Add constant for zip separator"
* commit '
cd588f847f3f23a9c60e32ab1e37c170e9f5be57':
Add constant for zip separator
Dmitriy Ivanov [Thu, 16 Jul 2015 15:59:15 +0000 (15:59 +0000)]
Merge "Add constant for zip separator"
Dmitriy Ivanov [Thu, 16 Jul 2015 11:52:06 +0000 (04:52 -0700)]
Add constant for zip separator
Change-Id: I1dcbb15ac612fc28e922eb3de8148fcaebbc0820
Evgenii Stepanov [Wed, 15 Jul 2015 23:57:15 +0000 (23:57 +0000)]
am
b3140904: Merge "Replace spaces with tabs in a Makefile."
* commit '
b31409040f1766d92e76e72bbdc1b346f4bb9d8e':
Replace spaces with tabs in a Makefile.
Evgenii Stepanov [Wed, 15 Jul 2015 23:22:38 +0000 (23:22 +0000)]
Merge "Replace spaces with tabs in a Makefile."
Evgenii Stepanov [Wed, 15 Jul 2015 23:19:59 +0000 (16:19 -0700)]
Replace spaces with tabs in a Makefile.
Sorry, I undertested my previous change and these guys somehow sneaked in.
This only affects SANITIZE_TARGET builds.
Change-Id: Id6986d89fa3d4965339f7b6fe973e9db73b380da
Evgenii Stepanov [Wed, 15 Jul 2015 17:50:49 +0000 (17:50 +0000)]
am
e9774a52: Merge "A special linker for ASan executables."
* commit '
e9774a5227749035dc55357ae3a34edaf545c3b3':
A special linker for ASan executables.
Evgenii Stepanov [Wed, 15 Jul 2015 17:24:19 +0000 (17:24 +0000)]
Merge "A special linker for ASan executables."
Evgenii Stepanov [Sat, 11 Jul 2015 00:54:01 +0000 (17:54 -0700)]
A special linker for ASan executables.
Setup a /system/bin/linker_asan as a symlink to "linker".
Read the linker name from PT_INTERP, and if it is linker_asan,
switch default library lookup paths to the ASan set, which
starts with the path to the instrumented libraries
(/data/lib), followed by /system/lib as a fallback.
This ensures that ASan binaries prefer ASan libraries, when
available. This approach is way better then RPATH/RUNPATH and even
better than LD_LIBRARY_PATH:
- RUNPATH is per-DSO, while default paths are global.
- LD_LIBRARY_PATH is overwritten by android_update_LD_LIBRARY_PATH.
- neither RUNPATH nor LD_LIBRARY_PATH appear in
android_get_LD_LIBRARY_PATH which is used to build java.lang.path.
Having ASan libraries in java.lang.path is a good thing.
Bug:
22355945
Change-Id: I1d2791fbf5740618f18f71a3ae3d873714669d3f
Yabin Cui [Tue, 14 Jul 2015 20:27:23 +0000 (20:27 +0000)]
am
60a11dcb: Merge "Add test for an Android kernel bug about prctl."
* commit '
60a11dcb44992f610e696fc246c70731012080dd':
Add test for an Android kernel bug about prctl.
Christopher Ferris [Tue, 14 Jul 2015 20:27:06 +0000 (20:27 +0000)]
am
a8d82f12: Merge "Update to v3.18.18 kernel headers."
* commit '
a8d82f126d1830ebee99e2622d08489a844e3e62':
Update to v3.18.18 kernel headers.
Christopher Ferris [Tue, 14 Jul 2015 17:15:51 +0000 (17:15 +0000)]
am
43d35c35: Merge "Do not hold hash table lock while backtracing." into mnc-dev
* commit '
43d35c356e2fbe0b022cef52445e93053c4ddbfd':
Do not hold hash table lock while backtracing.
Yabin Cui [Tue, 14 Jul 2015 02:48:44 +0000 (02:48 +0000)]
Merge "Add test for an Android kernel bug about prctl."
Yabin Cui [Mon, 13 Jul 2015 23:54:29 +0000 (16:54 -0700)]
Add test for an Android kernel bug about prctl.
Bug:
20017123
Change-Id: I8c109a06999a8bffcc8e8298b04ee637bb67d878
Christopher Ferris [Tue, 14 Jul 2015 01:29:46 +0000 (01:29 +0000)]
Merge "Update to v3.18.18 kernel headers."
Christopher Ferris [Tue, 14 Jul 2015 00:21:18 +0000 (17:21 -0700)]
Update to v3.18.18 kernel headers.
Change-Id: I0a0f423bda89500ad8e13a80582f05ec8bc756ea
Christopher Ferris [Mon, 13 Jul 2015 20:53:02 +0000 (20:53 +0000)]
am
5e3dc45a: Merge "Do not hold hash table lock while backtracing."
* commit '
5e3dc45a16c63b716bc4b7bed2f5752b41a5d5d5':
Do not hold hash table lock while backtracing.
Christopher Ferris [Mon, 13 Jul 2015 20:27:37 +0000 (20:27 +0000)]
Merge "Do not hold hash table lock while backtracing."
Christopher Ferris [Sun, 12 Jul 2015 05:47:06 +0000 (22:47 -0700)]
Do not hold hash table lock while backtracing.
There is a deadlock if holding the hash table lock while trying to do
a backtrace. Change the code so that the hash table lock is only held
while actually modifying either g_hash_table, or while modifying an
entry from g_hash_table.
Bug:
22423683
(cherry picked from commit
9fee99b06013787054a312449b94115038e2ad7c)
Change-Id: I72173bfe6f824ceaceea625c24e7851b87467135
Christopher Ferris [Mon, 13 Jul 2015 20:15:29 +0000 (20:15 +0000)]
Merge "Do not hold hash table lock while backtracing." into mnc-dev
Christopher Ferris [Sun, 12 Jul 2015 05:47:06 +0000 (22:47 -0700)]
Do not hold hash table lock while backtracing.
There is a deadlock if holding the hash table lock while trying to do
a backtrace. Change the code so that the hash table lock is only held
while actually modifying either g_hash_table, or while modifying an
entry from g_hash_table.
Bug:
22423683
Change-Id: I604ea56f940f22e99da41ea4dcdf97bedaac268d
Elliott Hughes [Sat, 11 Jul 2015 07:23:37 +0000 (07:23 +0000)]
am
147a50d0: Merge "Prevent user-defined basename_r from breaking basename(3)."
* commit '
147a50d06e1183e3f39f4f6d0fa28748b33d4aa9':
Prevent user-defined basename_r from breaking basename(3).
Elliott Hughes [Sat, 11 Jul 2015 07:03:53 +0000 (07:03 +0000)]
Merge "Prevent user-defined basename_r from breaking basename(3)."
Elliott Hughes [Sat, 11 Jul 2015 06:58:59 +0000 (23:58 -0700)]
Prevent user-defined basename_r from breaking basename(3).
LP64 is immune because basename_r is hidden there, but on LP32 a basename_r
defined in the executable breaks basename because its call to basename_r
will resolve to that one rather than the one in libc.
Bug: http://b/
22415484
Change-Id: Ied3ca7ad3fb0e744eb705fc924743f893b4ad490
Neil Fuller [Fri, 10 Jul 2015 10:35:23 +0000 (10:35 +0000)]
am
64c82544: Merge "Update timezone data to 2015e" into mnc-dev
* commit '
64c825441637b379be56a04622089e8e9b4b0da4':
Update timezone data to 2015e
Neil Fuller [Fri, 10 Jul 2015 09:47:51 +0000 (09:47 +0000)]
Merge "Update timezone data to 2015e" into mnc-dev
Dmitriy Ivanov [Fri, 10 Jul 2015 00:59:25 +0000 (00:59 +0000)]
am
a5bb841d: Fix memory-leak on soinfo_free()
* commit '
a5bb841df799e10e7d0ae3202b097da8a1c23507':
Fix memory-leak on soinfo_free()
Dmitriy Ivanov [Wed, 8 Jul 2015 22:26:46 +0000 (15:26 -0700)]
Fix memory-leak on soinfo_free()
Bug: http://b/
22290728
Change-Id: I00747056db2cd3ff8b33936278464daed7236536
(cherry picked from commit
609f11b31ecedc4e9f2a1f6017b60b1f51b15c22)
Dmitriy Ivanov [Thu, 9 Jul 2015 23:54:12 +0000 (23:54 +0000)]
am
880a2933: Merge "Fix memory-leak on soinfo_free()"
* commit '
880a293390b64da806a072f4ace2c2784b340876':
Fix memory-leak on soinfo_free()
Dmitriy Ivanov [Thu, 9 Jul 2015 23:32:18 +0000 (23:32 +0000)]
Merge "Fix memory-leak on soinfo_free()"
Pirama Arumuga Nainar [Thu, 9 Jul 2015 23:06:07 +0000 (23:06 +0000)]
am
d1e10d7d: Merge "Use delete[] to de-allocate pointers from new[]"
* commit '
d1e10d7d168a8461d9eb47e48802ea11d8bd0640':
Use delete[] to de-allocate pointers from new[]
Pirama Arumuga Nainar [Thu, 9 Jul 2015 22:40:50 +0000 (22:40 +0000)]
Merge "Use delete[] to de-allocate pointers from new[]"
Pirama Arumuga Nainar [Thu, 9 Jul 2015 17:15:15 +0000 (10:15 -0700)]
Use delete[] to de-allocate pointers from new[]
Upstream clang has a new diagnostic, '-Wmismatched-new-delete' to
generate a warning (that becomes an error with -Werror) when delete is
used to deallocate pointers created with 'new[]'. This patch fixes
'delete's that trigger this warning/error.
Change-Id: Id7b6f6c2df3e860e576de55e2f61f3d2be3a3986
Dmitriy Ivanov [Wed, 8 Jul 2015 22:26:46 +0000 (15:26 -0700)]
Fix memory-leak on soinfo_free()
Bug: http://b/
22290728
Change-Id: I00747056db2cd3ff8b33936278464daed7236536
Daniel Erat [Wed, 8 Jul 2015 21:44:59 +0000 (21:44 +0000)]
am
c6f25641: Merge "libc: Add sys/fcntl.h for compatibility."
* commit '
c6f25641eb874cd15f92759beff1ad67cfd8228b':
libc: Add sys/fcntl.h for compatibility.
Daniel Erat [Wed, 8 Jul 2015 21:15:22 +0000 (21:15 +0000)]
Merge "libc: Add sys/fcntl.h for compatibility."
Daniel Erat [Wed, 8 Jul 2015 21:01:50 +0000 (15:01 -0600)]
libc: Add sys/fcntl.h for compatibility.
Add a /usr/include/sys/fcntl.h file that includes <fcntl.h>.
Change-Id: Ie34bf7519607c5aae1fbea7c7dca249c9b7801cc
Evgenii Stepanov [Wed, 8 Jul 2015 20:16:59 +0000 (20:16 +0000)]
am
33ef6c20: Merge "Respect caller DT_RUNPATH in dlopen()."
* commit '
33ef6c20f2ddf19b29ed3a4e50139fa391b1a3d4':
Respect caller DT_RUNPATH in dlopen().
Evgenii Stepanov [Wed, 8 Jul 2015 19:50:02 +0000 (19:50 +0000)]
Merge "Respect caller DT_RUNPATH in dlopen()."
Christopher Ferris [Wed, 8 Jul 2015 19:40:38 +0000 (19:40 +0000)]
am
90de6820: Merge "Replace bx lr with update of pc from the stack."
* commit '
90de6820f736de1239b218ea2b63d15c38505e93':
Replace bx lr with update of pc from the stack.
Christopher Ferris [Wed, 8 Jul 2015 19:15:37 +0000 (19:15 +0000)]
Merge "Replace bx lr with update of pc from the stack."
Christopher Ferris [Mon, 6 Jul 2015 19:03:40 +0000 (12:03 -0700)]
Replace bx lr with update of pc from the stack.
When there is arm assembler of this format:
ldmxx sp!, {..., lr} or pop {..., lr}
bx lr
It can be replaced with:
ldmxx sp!, {..., pc} or pop {..., pc}
Change-Id: Ic27048c52f90ac4360ad525daf0361a830dc22a3
Evgenii Stepanov [Tue, 7 Jul 2015 00:56:31 +0000 (17:56 -0700)]
Respect caller DT_RUNPATH in dlopen().
When dlopen-ing a library, add the caller's DT_RUNPATH to the directory search
list. This fixes dlfcn.dt_runpath in bionic-unit-tests-glibc(32|64).
Bug:
21899363
Change-Id: Ife6a7e192939292cf4dc291b7e6b95945761cde3
Elliott Hughes [Tue, 7 Jul 2015 17:24:48 +0000 (17:24 +0000)]
am
7a9732d6: Merge "Add some glibc-like #defines for libchrome."
* commit '
7a9732d663906bedd8734c9952e35728c2662767':
Add some glibc-like #defines for libchrome.
Elliott Hughes [Tue, 7 Jul 2015 16:56:52 +0000 (16:56 +0000)]
Merge "Add some glibc-like #defines for libchrome."
Elliott Hughes [Tue, 7 Jul 2015 16:22:32 +0000 (09:22 -0700)]
Add some glibc-like #defines for libchrome.
libchrome uses __USE_XOPEN2K8 to decide whether futimens is
available. That's perhaps not the best idea, but there are other
cases where we defined the same feature macros as glibc to aid
portability.
Change-Id: Ie6e04cb181d88698d618e7dbd26cd347a6bf076c
Elliott Hughes [Mon, 6 Jul 2015 23:29:41 +0000 (23:29 +0000)]
am
65dd8582: Fix alignment after variable-length data.
* commit '
65dd858239c4e32a5a1afbc14ac30dbcdd2a50a3':
Fix alignment after variable-length data.
Elliott Hughes [Mon, 6 Jul 2015 22:54:52 +0000 (22:54 +0000)]
am
89bbb846: Merge "Fix alignment after variable-length data."
* commit '
89bbb846b9831f232b87d54a6eeb759ac603cc43':
Fix alignment after variable-length data.
Elliott Hughes [Mon, 6 Jul 2015 21:44:31 +0000 (21:44 +0000)]
Merge "Fix alignment after variable-length data."
Elliott Hughes [Mon, 6 Jul 2015 21:16:12 +0000 (14:16 -0700)]
Fix alignment after variable-length data.
In the serialized output from netd, the strings come first. Some code
assumes -- reasonably enough -- that it can do unaligned reads of pointers,
so we need to ensure alignment after all the strings.
(cherrypick of
65dd858239c4e32a5a1afbc14ac30dbcdd2a50a3.)
Bug: http://b/
21192318
Change-Id: I456639127db9a2583f7f738e6b8103375d9387fd
Elliott Hughes [Mon, 6 Jul 2015 21:16:12 +0000 (14:16 -0700)]
Fix alignment after variable-length data.
In the serialized output from netd, the strings come first. Some code
assumes -- reasonably enough -- that it can do unaligned reads of pointers,
so we need to ensure alignment after all the strings.
Bug: http://b/
21192318
Change-Id: I456639127db9a2583f7f738e6b8103375d9387fd
Elliott Hughes [Mon, 6 Jul 2015 20:22:48 +0000 (20:22 +0000)]
am
f542b309: Merge "Name the thread stack and signal stack guard pages."
* commit '
f542b30970ae863caceea1f635115f1195461e31':
Name the thread stack and signal stack guard pages.
Elliott Hughes [Mon, 6 Jul 2015 19:59:42 +0000 (19:59 +0000)]
Merge "Name the thread stack and signal stack guard pages."
Elliott Hughes [Thu, 2 Jul 2015 06:48:39 +0000 (23:48 -0700)]
Name the thread stack and signal stack guard pages.
Bug: http://b/
22228722
Change-Id: I1dae672e386e404fb304a34496a29fe21134c784
Dmitriy Ivanov [Wed, 1 Jul 2015 17:12:54 +0000 (17:12 +0000)]
am
f643eb38: Improve personality initialization
* commit '
f643eb38c36eb63f612e20dea09fd43ac6a6b360':
Improve personality initialization
Elliott Hughes [Wed, 1 Jul 2015 15:58:17 +0000 (15:58 +0000)]
am
77455f85: Merge "Fixed uchar.h for clang3.6"
* commit '
77455f85ab46bed6dc5f7246b474ede44ae9ede2':
Fixed uchar.h for clang3.6
Elliott Hughes [Wed, 1 Jul 2015 15:32:57 +0000 (15:32 +0000)]
Merge "Fixed uchar.h for clang3.6"
Neil Fuller [Wed, 1 Jul 2015 10:06:29 +0000 (10:06 +0000)]
am
86061f39: Merge "Update timezone data to 2015e"
* commit '
86061f39c2c5f5a5ee91b349d1c8cb7bf04003a3':
Update timezone data to 2015e
Neil Fuller [Wed, 1 Jul 2015 09:42:18 +0000 (09:42 +0000)]
Merge "Update timezone data to 2015e"
Dmitriy Ivanov [Wed, 1 Jul 2015 02:36:04 +0000 (02:36 +0000)]
am
416695a7: Merge "Improve personality initialization"
* commit '
416695a75c3892dd709a80ea8a640da07082594e':
Improve personality initialization
Dmitriy Ivanov [Wed, 1 Jul 2015 02:12:52 +0000 (02:12 +0000)]
Merge "Improve personality initialization"
Dmitriy Ivanov [Tue, 30 Jun 2015 22:10:51 +0000 (15:10 -0700)]
Improve personality initialization
1. Personality parameter should be unsigned int (not long)
2. Do not reset bits outside of PER_MASK when setting
personality value.
3. Set personality for static executables.
Bug: http://b/
21900686
Change-Id: I4c7e34079cbd59b818ce221eed325c05b9bb2303
(cherry picked from commit
f643eb38c36eb63f612e20dea09fd43ac6a6b360)
Dmitriy Ivanov [Tue, 30 Jun 2015 22:10:51 +0000 (15:10 -0700)]
Improve personality initialization
1. Personality parameter should be unsigned int (not long)
2. Do not reset bits outside of PER_MASK when setting
personality value.
3. Set personality for static executables.
Bug: http://b/
21900686
Change-Id: I4c7e34079cbd59b818ce221eed325c05b9bb2303
Neil Fuller [Tue, 30 Jun 2015 15:21:34 +0000 (16:21 +0100)]
Update timezone data to 2015e
Changes affecting future time stamps
Morocco will suspend DST from 2015-06-14 03:00 through 2015-07-19 02:00,
not 06-13 and 07-18 as we had guessed. (Thanks to Milamber.)
Assume Cayman Islands will observe DST starting next year, using US rules.
Although it isn't guaranteed, it is the most likely.
Bug:
21836574
Change-Id: I30ab9ba8524c79e389ed0ff8c4af4378b7048265
Neil Fuller [Tue, 30 Jun 2015 13:48:06 +0000 (14:48 +0100)]
Update timezone data to 2015e
Changes affecting future time stamps
Morocco will suspend DST from 2015-06-14 03:00 through 2015-07-19 02:00,
not 06-13 and 07-18 as we had guessed. (Thanks to Milamber.)
Assume Cayman Islands will observe DST starting next year, using US rules.
Although it isn't guaranteed, it is the most likely.
Bug:
21836574
Change-Id: I6eda60c220d5c55d2aa0934544866ec0f1ce62ab
Erik Kline [Tue, 30 Jun 2015 06:22:24 +0000 (06:22 +0000)]
am
754f6690: Pass around struct android_net_context for better behaviour
* commit '
754f669076ec1edfc0d597aaf89600d4c93f9a7c':
Pass around struct android_net_context for better behaviour
Erik Kline [Thu, 25 Jun 2015 05:27:34 +0000 (14:27 +0900)]
Pass around struct android_net_context for better behaviour
Group network context elements in to a single struct and
add a version of android_getaddrinfofornet() that accepts it.
The introduction of UID-based routing means that the UID is an
integral part of the network context when evaluating connectivity,
sorting addresses, etc.
Also, introduce a distinction between DNS netids/marks and those
expected to be used by the application. This can be important
when the network an application is using is not the same as the
network on which DNS queries will be issued.
Additionally, de-duplicate the UDP connect logic (collapse both
_test_connect() and _find_src_addr() into just the latter).
Bug:
19470192
Bug:
20733156
Bug:
21832279
Change-Id: If16c2f4744695f507993afdac078ca105eb5d3e4
(cherry picked from commit
01e37c9665018534c798daaa59d5b0adb408e0a4)
Erik Kline [Tue, 30 Jun 2015 02:42:17 +0000 (02:42 +0000)]
am
7f46cf9a: Merge "Pass around struct android_net_context for better behaviour"
* commit '
7f46cf9a5f0b3e54d97fc94a83b955ae4c335a31':
Pass around struct android_net_context for better behaviour
Erik Kline [Tue, 30 Jun 2015 02:21:00 +0000 (02:21 +0000)]
Merge "Pass around struct android_net_context for better behaviour"
Dmitriy Ivanov [Mon, 29 Jun 2015 22:41:55 +0000 (22:41 +0000)]
am
f7d5bf33: Lock on dl_interate_phdr
* commit '
f7d5bf334dc4bc5b7399d4c8268e1b0bf676548f':
Lock on dl_interate_phdr
Dmitriy Ivanov [Mon, 29 Jun 2015 22:38:20 +0000 (22:38 +0000)]
am
83474cd3: Merge "Lock on dl_interate_phdr"
* commit '
83474cd38712c0f955174609a880deabebb27518':
Lock on dl_interate_phdr
Dmitriy Ivanov [Mon, 29 Jun 2015 22:15:07 +0000 (22:15 +0000)]
Merge "Lock on dl_interate_phdr"
Dmitriy Ivanov [Mon, 29 Jun 2015 21:48:25 +0000 (14:48 -0700)]
Lock on dl_interate_phdr
There is possibility of someone dlclosing a library
while dl_iterate_phdr in progress which can lead to
dl_iterate_phdr calling callback with invalid address
if it was unmapped by dlclose.
Bug: http://b/
22047255
Change-Id: I3fc0d9fd2c51fb36fd34cb035f37271fa893a7be
(cherry picked from commit
f7d5bf334dc4bc5b7399d4c8268e1b0bf676548f)
Dmitriy Ivanov [Mon, 29 Jun 2015 21:48:25 +0000 (14:48 -0700)]
Lock on dl_interate_phdr
There is possibility of someone dlclosing a library
while dl_iterate_phdr in progress which can lead to
dl_iterate_phdr calling callback with invalid address
if it was unmapped by dlclose.
Bug: http://b/
22047255
Change-Id: I3fc0d9fd2c51fb36fd34cb035f37271fa893a7be
Dmitriy Ivanov [Mon, 29 Jun 2015 21:34:07 +0000 (21:34 +0000)]
am
46d24d12: Merge "Replace NULL with nullptr"
* commit '
46d24d12e167a0b5afa4ded218aa4db0a477141a':
Replace NULL with nullptr
Elliott Hughes [Mon, 29 Jun 2015 21:23:22 +0000 (21:23 +0000)]
am
25da2d7c: Merge "Add <sysexits.h>."
* commit '
25da2d7ca2795156552ed96e1f3c3245330682b0':
Add <sysexits.h>.
Dmitriy Ivanov [Mon, 29 Jun 2015 21:08:48 +0000 (21:08 +0000)]
Merge "Replace NULL with nullptr"
Elliott Hughes [Mon, 29 Jun 2015 21:01:05 +0000 (21:01 +0000)]
Merge "Add <sysexits.h>."
Elliott Hughes [Mon, 29 Jun 2015 20:44:34 +0000 (13:44 -0700)]
Add <sysexits.h>.
Taken from current upstream OpenBSD.
Bug: http://b/
22172963
Change-Id: Ic899e08541335777296fa8ec99e518f35a100144
Yusuke Sato [Mon, 29 Jun 2015 18:14:58 +0000 (18:14 +0000)]
am
71107cdd: Merge "Rename ZipEntryName to ZipString"
* commit '
71107cdd028461c433a39a10eb192edbdf03dede':
Rename ZipEntryName to ZipString
Yusuke Sato [Mon, 29 Jun 2015 17:49:28 +0000 (17:49 +0000)]
Merge "Rename ZipEntryName to ZipString"
egor.kochetov [Thu, 25 Jun 2015 13:52:36 +0000 (16:52 +0300)]
Fixed uchar.h for clang3.6
The NDK self-test issue64679-prctl failed to build because by default
clang3.6 builds in C11 mode, but the ifdef in the file 'uchar.h' hid the
required char16_t and char32_t declarations based on the GCC version,
which is declared as 4 by clang.
The ifdef is changed so that it is based on C version rather than a
compiler version. This way it is compatible with gcc 4, gcc 5 and clang
which are actually the only used toolchains.
See also: b.android.com/177609
Change-Id: I78c4bdc681c6f8a31b92dbe8ffe35e84ef2eda36
Signed-off-by: Egor Kochetov <egor.kochetov@intel.com>
Erik Kline [Thu, 25 Jun 2015 05:27:34 +0000 (14:27 +0900)]
Pass around struct android_net_context for better behaviour
Group network context elements in to a single struct and
add a version of android_getaddrinfofornet() that accepts it.
The introduction of UID-based routing means that the UID is an
integral part of the network context when evaluating connectivity,
sorting addresses, etc.
Also, introduce a distinction between DNS netids/marks and those
expected to be used by the application. This can be important
when the network an application is using is not the same as the
network on which DNS queries will be issued.
Additionally, de-duplicate the UDP connect logic (collapse both
_test_connect() and _find_src_addr() into just the latter).
Bug:
19470192
Bug:
20733156
Bug:
21832279
Change-Id: If16c2f4744695f507993afdac078ca105eb5d3e4
Dmitriy Ivanov [Fri, 26 Jun 2015 15:09:23 +0000 (15:09 +0000)]
am
06700b2b: Fix crash when trying to load invalid ELF file.
* commit '
06700b2b5e92a365505b15d0d05e2d5b0706c511':
Fix crash when trying to load invalid ELF file.
Dmitriy Ivanov [Fri, 26 Jun 2015 04:12:23 +0000 (04:12 +0000)]
am
eeb9f5e4: Merge "Fix crash when trying to load invalid ELF file."
* commit '
eeb9f5e41662828989f3913d81ec23229a668434':
Fix crash when trying to load invalid ELF file.