Nick Kralevich
bcd18c0485
am 27ff1ae4: am de666485: am ba117e41: Merge "stack protector: use AT_RANDOM"
...
* commit '27ff1ae414915789b27d0a485ff6d856ae742aad':
stack protector: use AT_RANDOM
2013-01-16 13:34:46 -08:00
Nick Kralevich
dde6b88a9f
am 079e4356: am 30894bdf: am 1b34228b: Merge "Filter ANDROID_PROPERTY_WORKSPACE"
...
* commit '079e4356550030e8bacec86b8aa058ade2b7142c':
Filter ANDROID_PROPERTY_WORKSPACE
2013-01-16 13:34:45 -08:00
Elliott Hughes
31ecd0c342
am b989c9ce: (-s ours) Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic.""
...
* commit 'b989c9ceda71f6f75112645b5c45af341275cbab':
Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic.""
2013-01-16 13:31:35 -08:00
Nick Kralevich
27ff1ae414
am de666485: am ba117e41: Merge "stack protector: use AT_RANDOM"
...
* commit 'de666485b8123ac35be94109336f7c56a7e9e3c2':
stack protector: use AT_RANDOM
2013-01-16 13:31:24 -08:00
Nick Kralevich
079e435655
am 30894bdf: am 1b34228b: Merge "Filter ANDROID_PROPERTY_WORKSPACE"
...
* commit '30894bdfd6e4c74ab673d47391e62fb14fb51381':
Filter ANDROID_PROPERTY_WORKSPACE
2013-01-16 13:31:23 -08:00
Nick Kralevich
de666485b8
am ba117e41: Merge "stack protector: use AT_RANDOM"
...
* commit 'ba117e4172fe6f160bf5f4d58b37e12c08c34245':
stack protector: use AT_RANDOM
2013-01-16 11:31:00 -08:00
Nick Kralevich
ba117e4172
Merge "stack protector: use AT_RANDOM"
2013-01-16 11:23:26 -08:00
Nick Kralevich
30894bdfd6
am 1b34228b: Merge "Filter ANDROID_PROPERTY_WORKSPACE"
...
* commit '1b34228bb289723c4ba0534eae57d0d085a3d0fa':
Filter ANDROID_PROPERTY_WORKSPACE
2013-01-16 11:14:01 -08:00
Nick Kralevich
1b34228bb2
Merge "Filter ANDROID_PROPERTY_WORKSPACE"
2013-01-16 11:11:17 -08:00
Elliott Hughes
b989c9ceda
Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic.""
...
This reverts commit f4b34b6c3942be273ad7298a40be0d312b183aab.
2013-01-16 10:34:33 -08:00
Nick Kralevich
e3a49a8661
stack protector: use AT_RANDOM
...
Populate the stack canaries from the kernel supplied
AT_RANDOM value, which doesn't involve any system calls.
This is slightly faster (6 fewer syscalls) and avoids
unnecessarily reading /dev/urandom, which depletes entropy.
Bug: 7959813
Change-Id: If2b43100a2a9929666df3de56b6139fed969e0f1
2013-01-16 10:09:52 -08:00
Elliott Hughes
1a18895ebc
am e05709b1: am e611fad0: am 14e1975e: Merge "Fix signalfd for MIPS."
...
* commit 'e05709b1df7dba98c37e83f84dcbd2ad8429bcfc':
Fix signalfd for MIPS.
2013-01-16 09:50:42 -08:00
Elliott Hughes
e05709b1df
am e611fad0: am 14e1975e: Merge "Fix signalfd for MIPS."
...
* commit 'e611fad0d055f2d869981136e5e51b7a01d525fc':
Fix signalfd for MIPS.
2013-01-16 09:48:04 -08:00
Elliott Hughes
e611fad0d0
am 14e1975e: Merge "Fix signalfd for MIPS."
...
* commit '14e1975e13c197180ed0481f305f83a362b16a24':
Fix signalfd for MIPS.
2013-01-16 09:45:57 -08:00
Elliott Hughes
14e1975e13
Merge "Fix signalfd for MIPS."
2013-01-16 09:42:51 -08:00
Elliott Hughes
f193b9fc21
Fix signalfd for MIPS.
...
Also mark signalfd's sigset_t* argument as non-nullable.
Change-Id: I466e09cdf3fb92480744c496da92274a97f99dd1
2013-01-16 09:40:25 -08:00
Nick Kralevich
a0f64756a4
Filter ANDROID_PROPERTY_WORKSPACE
...
When executing a setuid executable, filter out ANDROID_PROPERTY_WORKSPACE
from the environment. Some applications implicitly trust the property
space and don't realize that it's passed by an environment variable
which can be modified by the caller.
Change-Id: I3e3a98941f0a1f249a2ff983ecbcfe1278aa9159
2013-01-15 16:02:03 -08:00
Elliott Hughes
7cfe0d2602
am 04aa0fdd: (-s ours) am 42c5847d: (-s ours) am 791e26d9: (-s ours) Merge "Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."""
...
* commit '04aa0fdda60b6a492e572c2a79f21c732e8c33c8':
Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic.""
2013-01-15 13:40:39 -08:00
Elliott Hughes
04aa0fdda6
am 42c5847d: (-s ours) am 791e26d9: (-s ours) Merge "Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."""
...
* commit '42c5847d65d3e50a3efc4e32bb913dc66c9d0e4d':
Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic.""
2013-01-15 13:37:56 -08:00
Elliott Hughes
42c5847d65
am 791e26d9: (-s ours) Merge "Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."""
...
* commit '791e26d9598a72376b8a16a5ccfb5d1ae0010965':
Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic.""
2013-01-15 13:35:58 -08:00
Elliott Hughes
791e26d959
Merge "Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."""
2013-01-15 13:21:52 -08:00
Nick Kralevich
0112ee2190
am d29c9fc1: am b59e358b: Merge "fix strerror_r test"
...
* commit 'd29c9fc18860a41f59d390b4aab937b61dd63ea1':
fix strerror_r test
2013-01-15 11:20:23 -08:00
Nick Kralevich
d29c9fc188
am b59e358b: Merge "fix strerror_r test"
...
* commit 'b59e358bb902124cc7d648266a97f96beefc8142':
fix strerror_r test
2013-01-15 11:15:21 -08:00
Elliott Hughes
acb907fb0d
Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic.""
...
This reverts commit f4b34b6c3942be273ad7298a40be0d312b183aab.
The revert was only meant to apply to the jb-mr1 branch, but accidentally
leaked out into AOSP. This revert-revert gets AOSP master and internal
master back in sync.
2013-01-15 11:12:18 -08:00
Nick Kralevich
b59e358bb9
Merge "fix strerror_r test"
2013-01-15 10:56:07 -08:00
Nick Kralevich
606058933c
fix strerror_r test
...
e6e60065ff093ff8c859ab146cf543531cb1967c modified strerror_r to
treat errno as signed. However, the change to the test code
modified the "strerror" test, not the "strerror_r" test.
Make the same change for the strerror_r code.
Change-Id: Ia236a53df5745935e229a4446a74da8bed0cfd7b
2013-01-15 10:35:09 -08:00
Ben Cheng
6405103a32
am 4130af46: am b09d7d86: Merge "Add __aeabi_idiv to the dummy reference list."
...
* commit '4130af46bf120ac82ed61453215c7a692d84c1dd':
Add __aeabi_idiv to the dummy reference list.
2013-01-14 18:01:35 -08:00
Ben Cheng
4130af46bf
am b09d7d86: Merge "Add __aeabi_idiv to the dummy reference list."
...
* commit 'b09d7d86004ab75b774358454d8ee261987af96b':
Add __aeabi_idiv to the dummy reference list.
2013-01-14 15:44:01 -08:00
Ben Cheng
b09d7d8600
Merge "Add __aeabi_idiv to the dummy reference list."
2013-01-14 15:35:04 -08:00
Ben Cheng
35f5385aa5
Add __aeabi_idiv to the dummy reference list.
...
If the platform code is compiled with -mcpu=cortex-a15, then without this
change prebuilt libraries built against -march=armv7 cannot resolve the
dependency on __aeabi_idiv (provided by libgcc.a).
Bug: 7961327
cherry-picked from internal master.
Change-Id: I8fe59a98eb53d641518b882523c1d6a724fb7e55
2013-01-14 15:33:40 -08:00
Nick Kralevich
9e22af2363
am 1519690c: am 29fe857e: Merge "headers: update auxvec.h from Linux kernel"
...
* commit '1519690cfb27af79627a8d39bf158a1feca953e3':
headers: update auxvec.h from Linux kernel
2013-01-14 14:38:36 -08:00
Nick Kralevich
1519690cfb
am 29fe857e: Merge "headers: update auxvec.h from Linux kernel"
...
* commit '29fe857ec80e59347e28458a5396eb68d1cba0e4':
headers: update auxvec.h from Linux kernel
2013-01-14 14:31:28 -08:00
Nick Kralevich
29fe857ec8
Merge "headers: update auxvec.h from Linux kernel"
2013-01-14 14:14:49 -08:00
Ben Cheng
86050b9e92
Merge "Add __aeabi_idiv to the dummy reference list."
2013-01-14 13:36:33 -08:00
Nick Kralevich
a67e4de662
headers: update auxvec.h from Linux kernel
...
Pull a new version of auxvec.h from the upstream Linux
kernel at commit b719f43059903820c31edb30f4663a2818836e7f
These files were generated using the following commands:
cd bionic/libc/kernel
./tools/clean_header.py -u ../../../external/kernel-headers/original/uapi/linux/auxvec.h
./tools/clean_header.py -u ../../../external/kernel-headers/original/linux/auxvec.h
./tools/clean_header.py -u ../../../external/kernel-headers/original/asm-x86/auxvec.h
This change is needed to get AT_RANDOM defined.
Change-Id: Ib064649684b17af6ff4b1a31d501a05f78bb81d0
2013-01-14 11:49:59 -08:00
Ben Cheng
a4e964d200
Add __aeabi_idiv to the dummy reference list.
...
If the platform code is compiled with -mcpu=cortex-a15, then without this
change prebuilt libraries built against -march=armv7 cannot resolve the
dependency on __aeabi_idiv (provided by libgcc.a).
Bug: 7961327
Change-Id: I0a05ce9c44e44d39b8ce1f0e319e2d37a010f3c7
2013-01-14 11:27:29 -08:00
Ian Rogers
7f7f232f4a
am 763d4bb3: am 68fa57f0: Merge "Name anonymous mmap mallocs."
...
* commit '763d4bb345b2e8882dd39d0656ee9f23ca1d0512':
Name anonymous mmap mallocs.
2013-01-14 11:22:56 -08:00
Ian Rogers
763d4bb345
am 68fa57f0: Merge "Name anonymous mmap mallocs."
...
* commit '68fa57f000285af20100c00db3d2bc143ad32294':
Name anonymous mmap mallocs.
2013-01-14 11:19:00 -08:00
Ian Rogers
68fa57f000
Merge "Name anonymous mmap mallocs."
2013-01-14 10:54:44 -08:00
Nick Kralevich
1165da8390
am 13bd3716: am bb897fa9: Merge "libc_init_static: apply relro earlier."
...
* commit '13bd37160ee340ddcf7e1fb57251b124e0ec69c1':
libc_init_static: apply relro earlier.
2013-01-14 10:34:45 -08:00
Elliott Hughes
32cefdbc7a
am 375db86a: am 09d13c39: Merge "Fix my git mistake."
...
* commit '375db86aeaedfe716b69a62f81a2484ee446d5e5':
Fix my git mistake.
2013-01-14 10:34:44 -08:00
Nick Kralevich
13bd37160e
am bb897fa9: Merge "libc_init_static: apply relro earlier."
...
* commit 'bb897fa9f79d25e4445fe3ab46b86657d6660c10':
libc_init_static: apply relro earlier.
2013-01-14 10:25:16 -08:00
Nick Kralevich
bb897fa9f7
Merge "libc_init_static: apply relro earlier."
2013-01-14 10:21:23 -08:00
Elliott Hughes
375db86aea
am 09d13c39: Merge "Fix my git mistake."
...
* commit '09d13c393e7b6a77cc33e5ef87e5c92ccd13fe63':
Fix my git mistake.
2013-01-14 10:08:56 -08:00
Elliott Hughes
09d13c393e
Merge "Fix my git mistake."
2013-01-14 09:57:45 -08:00
Elliott Hughes
99c32055cb
Fix my git mistake.
...
This was the formatting change that was supposed to be in
cf23905a4bcc7bfdd109be5b6d69ad06877aa217.
Change-Id: Ib79fa031b68f6f541f532507eb589afeaedb831f
2013-01-14 09:56:21 -08:00
Elliott Hughes
14ab1a63d6
am bc3c7183: am 48c632a3: Merge "[MIPS] Set DT_DEBUG dyntab entry if it is writable"
...
* commit 'bc3c718346d81c04451c35c2d8fb00c68b0a815d':
[MIPS] Set DT_DEBUG dyntab entry if it is writable
2013-01-14 09:50:50 -08:00
Elliott Hughes
bc3c718346
am 48c632a3: Merge "[MIPS] Set DT_DEBUG dyntab entry if it is writable"
...
* commit '48c632a381b10996ec72a53cc95b009b06785d09':
[MIPS] Set DT_DEBUG dyntab entry if it is writable
2013-01-14 09:46:19 -08:00
Elliott Hughes
48c632a381
Merge "[MIPS] Set DT_DEBUG dyntab entry if it is writable"
2013-01-14 09:31:04 -08:00
Chris Dearman
cf23905a4b
[MIPS] Set DT_DEBUG dyntab entry if it is writable
...
This is primarily for MIPS exutables that do not have a
DT_MIPS_RLD_MAP entry.
Change-Id: I4c221d92debcfed961eeee2515123f3fb21ec8e6
Signed-off-by: Chris Dearman <chris@mips.com>
2013-01-14 09:30:25 -08:00