OSDN Git Service
Elliott Hughes [Fri, 25 Jan 2013 22:10:02 +0000 (14:10 -0800)]
am
7ae99845: am
6a94cb74: Merge "arm syscall : for eabi call_default don\'t use stack"
# By Matthieu Castet
# Via Android Git Automerger (1) and others
* commit '
7ae998456c2564aff4ecbe6a6df214821f6e26cc':
arm syscall : for eabi call_default don't use stack
Nick Kralevich [Fri, 25 Jan 2013 22:10:01 +0000 (14:10 -0800)]
am
27818d2a: am
b871e5d6: Merge "system_properties: do more checking of file"
# Via Android Git Automerger (1) and others
* commit '
27818d2a16e4972acba15368f55a59cc0ed990f0':
system_properties: do more checking of file
Elliott Hughes [Fri, 25 Jan 2013 22:08:26 +0000 (14:08 -0800)]
am
6a94cb74: Merge "arm syscall : for eabi call_default don\'t use stack"
# By Matthieu Castet
# Via Gerrit Code Review (1) and Matthieu Castet (1)
* commit '
6a94cb748bf63278c3271b0ab610061b0dc6f04a':
arm syscall : for eabi call_default don't use stack
Nick Kralevich [Fri, 25 Jan 2013 22:08:26 +0000 (14:08 -0800)]
am
b871e5d6: Merge "system_properties: do more checking of file"
# Via Gerrit Code Review (1) and Nick Kralevich (1)
* commit '
b871e5d6b3b4a214c7f19bdfca7663f1fe49fda8':
system_properties: do more checking of file
Elliott Hughes [Fri, 25 Jan 2013 21:57:58 +0000 (21:57 +0000)]
Merge "arm syscall : for eabi call_default don't use stack"
Nick Kralevich [Fri, 25 Jan 2013 21:52:00 +0000 (21:52 +0000)]
Merge "system_properties: do more checking of file"
Nick Kralevich [Fri, 25 Jan 2013 21:07:31 +0000 (13:07 -0800)]
system_properties: do more checking of file
Check that the permissions on the properties file
are exactly as we expect them to be.
Make sure we close the fd if fstat fails.
Refactor the code slightly.
Change-Id: I5503fd58c3b8093ce7e6d05920748ed70eaf8e2c
Nick Kralevich [Fri, 25 Jan 2013 00:11:56 +0000 (16:11 -0800)]
am
da2d2c61: am
82ef8296: Merge "prctl.h: include sys/cdefs.h"
# Via Android Git Automerger (1) and others
* commit '
da2d2c618c23f212f8dec0c0615bf75d7c18b88d':
prctl.h: include sys/cdefs.h
Nick Kralevich [Thu, 24 Jan 2013 16:59:00 +0000 (08:59 -0800)]
am
82ef8296: Merge "prctl.h: include sys/cdefs.h"
# Via Gerrit Code Review (1) and Nick Kralevich (1)
* commit '
82ef8296dc5e25b9cc8e7231f9515f50185dac9d':
prctl.h: include sys/cdefs.h
Nick Kralevich [Thu, 24 Jan 2013 16:44:59 +0000 (16:44 +0000)]
Merge "prctl.h: include sys/cdefs.h"
Nick Kralevich [Thu, 24 Jan 2013 00:49:47 +0000 (16:49 -0800)]
prctl.h: include sys/cdefs.h
prctl.h uses __BEGIN_DECLS but fails to include sys/cdefs.h
(where it's defined). Code which includes prctl.h without
previously including sys/cdefs.h will fail to compile.
Fixed.
Change-Id: If4c9f3308f08b93596dcd00e351ae786807e9320
Nick Kralevich [Wed, 23 Jan 2013 19:09:40 +0000 (11:09 -0800)]
am
e7d937b5: am
b3351f12: Merge "libc: use more secure system properties if available"
* commit '
e7d937b52f183ce84751701c369ffe6a4c81d033':
libc: use more secure system properties if available
Nick Kralevich [Wed, 23 Jan 2013 19:07:23 +0000 (11:07 -0800)]
am
b3351f12: Merge "libc: use more secure system properties if available"
* commit '
b3351f12047747b603efb070069e7afdf3040335':
libc: use more secure system properties if available
Nick Kralevich [Wed, 23 Jan 2013 18:50:24 +0000 (18:50 +0000)]
Merge "libc: use more secure system properties if available"
Nick Kralevich [Wed, 23 Jan 2013 17:28:35 +0000 (09:28 -0800)]
libc: use more secure system properties if available
Currently, system properties are passed via the environment
variable ANDROID_PROPERTY_WORKSPACE and a file descriptor passed
from parent to child. This is insecure for setuid executables,
as the environment variable can be changed by the caller.
Modify system property handling so that we get the properties
from a root owned properties file, rather than using an
environment variable. Fall back to the environment variable
if the file doesn't exist.
Bug:
8045561
Change-Id: I54f3efa98cf7d63d88788da5ce0d19e34fd7851a
Elliott Hughes [Wed, 23 Jan 2013 06:14:32 +0000 (22:14 -0800)]
am
40107623: am
778a68e1: Merge "Don\'t free anything when reporting leaks."
* commit '
40107623b05fdc2b6c61d9c885483abd3add486a':
Don't free anything when reporting leaks.
Elliott Hughes [Wed, 23 Jan 2013 06:14:31 +0000 (22:14 -0800)]
am
552e02fa: am
5c8f75ef: Merge "Disable leak checking for mksh; it\'s way too leaky."
* commit '
552e02fa9c99fd234c57d756358e3208d11a13ad':
Disable leak checking for mksh; it's way too leaky.
Elliott Hughes [Wed, 23 Jan 2013 06:11:55 +0000 (22:11 -0800)]
am
778a68e1: Merge "Don\'t free anything when reporting leaks."
* commit '
778a68e1e57408be04806b5bfc3150aade44bcbf':
Don't free anything when reporting leaks.
Elliott Hughes [Wed, 23 Jan 2013 06:11:54 +0000 (22:11 -0800)]
am
5c8f75ef: Merge "Disable leak checking for mksh; it\'s way too leaky."
* commit '
5c8f75ef8bd89498de1d1108efa54869a2784738':
Disable leak checking for mksh; it's way too leaky.
Elliott Hughes [Wed, 23 Jan 2013 06:06:21 +0000 (06:06 +0000)]
Merge "Don't free anything when reporting leaks."
Elliott Hughes [Wed, 23 Jan 2013 06:05:18 +0000 (06:05 +0000)]
Merge "Disable leak checking for mksh; it's way too leaky."
Elliott Hughes [Wed, 23 Jan 2013 02:36:28 +0000 (18:36 -0800)]
Don't free anything when reporting leaks.
We don't know that they're not going to be cleaned up by a
C++ global destructor that runs after us. This is the case with
bootanimation, for example.
Bug:
7291287
Change-Id: Iba402514d1735fdc2ae4bc95b65396d816be46c0
Elliott Hughes [Wed, 23 Jan 2013 02:35:14 +0000 (18:35 -0800)]
Disable leak checking for mksh; it's way too leaky.
When each shell leaks ~240 allocations, you can't see the leaks from
the program you ran with "adb shell".
Bug:
7291287
Change-Id: Ib8780db72ba0114ebdb24768537da74bbb61f354
Elliott Hughes [Wed, 23 Jan 2013 01:29:01 +0000 (17:29 -0800)]
am
b16ec162: am
28f82b26: Merge "Add const for first argument of sigismember for fit POSIX spec"
* commit '
b16ec162881110a30f665ce7bd1432ccefba60b7':
Add const for first argument of sigismember for fit POSIX spec
Elliott Hughes [Wed, 23 Jan 2013 01:26:45 +0000 (17:26 -0800)]
am
28f82b26: Merge "Add const for first argument of sigismember for fit POSIX spec"
* commit '
28f82b260c9076aae437dafb57193a174aef1eb3':
Add const for first argument of sigismember for fit POSIX spec
Elliott Hughes [Wed, 23 Jan 2013 01:11:28 +0000 (01:11 +0000)]
Merge "Add const for first argument of sigismember for fit POSIX spec"
Elliott Hughes [Tue, 22 Jan 2013 23:33:24 +0000 (15:33 -0800)]
am
57edf36c: am
8d6302cd: Merge "Our strcoll(3) is no different from NetBSD\'s, so take exactly theirs."
* commit '
57edf36c5f83fa7bcf9d8d028cde0acc7ddfadcc':
Our strcoll(3) is no different from NetBSD's, so take exactly theirs.
Elliott Hughes [Tue, 22 Jan 2013 23:31:26 +0000 (15:31 -0800)]
am
8d6302cd: Merge "Our strcoll(3) is no different from NetBSD\'s, so take exactly theirs."
* commit '
8d6302cdcff9c53fe3ecd36ab479fdf08318c504':
Our strcoll(3) is no different from NetBSD's, so take exactly theirs.
Elliott Hughes [Tue, 22 Jan 2013 23:19:35 +0000 (23:19 +0000)]
Merge "Our strcoll(3) is no different from NetBSD's, so take exactly theirs."
Elliott Hughes [Tue, 22 Jan 2013 23:10:19 +0000 (15:10 -0800)]
Our strcoll(3) is no different from NetBSD's, so take exactly theirs.
Change-Id: I45251047202a229f9175735ecc23c0ebcda71e8d
Elliott Hughes [Tue, 22 Jan 2013 23:08:58 +0000 (15:08 -0800)]
am
5f7b6b83: am
547eba0a: Merge "Avoid overflow in memccpy."
* commit '
5f7b6b8301658a834516f05e8e0a9eb4513e6e62':
Avoid overflow in memccpy.
Elliott Hughes [Tue, 22 Jan 2013 23:05:31 +0000 (15:05 -0800)]
am
547eba0a: Merge "Avoid overflow in memccpy."
* commit '
547eba0a63951d7db93c0542e1ecab891725b9a8':
Avoid overflow in memccpy.
Elliott Hughes [Tue, 22 Jan 2013 22:53:53 +0000 (22:53 +0000)]
Merge "Avoid overflow in memccpy."
Elliott Hughes [Tue, 22 Jan 2013 22:53:25 +0000 (14:53 -0800)]
am
e8e1f34a: am
85597e2b: Merge "Clean up debuggerd-related logging."
* commit '
e8e1f34a33158290aa3bb9059e31ddc7a73ac1e6':
Clean up debuggerd-related logging.
Elliott Hughes [Tue, 22 Jan 2013 22:49:11 +0000 (14:49 -0800)]
am
85597e2b: Merge "Clean up debuggerd-related logging."
* commit '
85597e2b59af91be0607ed073b6574b934ed369d':
Clean up debuggerd-related logging.
Elliott Hughes [Tue, 22 Jan 2013 22:41:23 +0000 (14:41 -0800)]
Avoid overflow in memccpy.
Just take the upstream NetBSD code.
Bug: http://code.google.com/p/android/issues/detail?id=43078
Change-Id: Ibbbde9d00e8bc6a09c9503aab2b04b4e3d1f98b0
Elliott Hughes [Tue, 22 Jan 2013 22:37:27 +0000 (22:37 +0000)]
Merge "Clean up debuggerd-related logging."
Elliott Hughes [Tue, 22 Jan 2013 22:35:06 +0000 (14:35 -0800)]
am
0609c0fe: am
7af7895e: Merge "Use the new non-allocating logging for dlmalloc failures."
* commit '
0609c0fe8dae2ec10f1811c46a4d583f557c68f7':
Use the new non-allocating logging for dlmalloc failures.
Elliott Hughes [Tue, 22 Jan 2013 22:32:02 +0000 (14:32 -0800)]
am
7af7895e: Merge "Use the new non-allocating logging for dlmalloc failures."
* commit '
7af7895eeb810ff1a1ca8b60fcda13595d551114':
Use the new non-allocating logging for dlmalloc failures.
Elliott Hughes [Tue, 22 Jan 2013 22:26:35 +0000 (22:26 +0000)]
Merge "Use the new non-allocating logging for dlmalloc failures."
Elliott Hughes [Tue, 22 Jan 2013 22:00:09 +0000 (14:00 -0800)]
Use the new non-allocating logging for dlmalloc failures.
Change-Id: I88afe0201ee5766a295fc5a9e710fba9d6e0d363
Elliott Hughes [Tue, 22 Jan 2013 22:17:14 +0000 (14:17 -0800)]
Clean up debuggerd-related logging.
Bug:
7291287
Change-Id: Ia7aa386e8b75b8058d7d9e707e11b1da7dc62f00
Nick Kralevich [Tue, 22 Jan 2013 21:43:46 +0000 (13:43 -0800)]
am
e652ed30: am
244bee5b: Merge "bionic_auxv.h: fix #define conflict"
* commit '
e652ed30514afcf314b40c69b9cac088602a83da':
bionic_auxv.h: fix #define conflict
Nick Kralevich [Tue, 22 Jan 2013 21:38:53 +0000 (13:38 -0800)]
am
244bee5b: Merge "bionic_auxv.h: fix #define conflict"
* commit '
244bee5bb6e0bc12b739c57028ac8af23a18aed0':
bionic_auxv.h: fix #define conflict
Nick Kralevich [Tue, 22 Jan 2013 21:30:27 +0000 (21:30 +0000)]
Merge "bionic_auxv.h: fix #define conflict"
Nick Kralevich [Tue, 22 Jan 2013 21:09:04 +0000 (13:09 -0800)]
bionic_auxv.h: fix #define conflict
Both libc/include/sys/auxv.h and libc/private/bionic_auxv.h
use _SYS_AUXV_H_ to see if a header file has already been included.
This prevents both of these files from being included at the same
time.
Fix this name conflict.
Change-Id: Ifaec88aa9779d784b95f8e75145117acf3d5cfc5
Elliott Hughes [Tue, 22 Jan 2013 19:34:25 +0000 (11:34 -0800)]
am
8ef83bc4: am
02f96b9d: Merge "Add missing extern "C"."
* commit '
8ef83bc46e06e8fe98e918fcb1c582d6f5807461':
Add missing extern "C".
Elliott Hughes [Tue, 22 Jan 2013 19:32:16 +0000 (11:32 -0800)]
am
02f96b9d: Merge "Add missing extern "C"."
* commit '
02f96b9db0242711fe1dfe0713c0c4e698561da5':
Add missing extern "C".
Elliott Hughes [Tue, 22 Jan 2013 19:22:46 +0000 (19:22 +0000)]
Merge "Add missing extern "C"."
Elliott Hughes [Tue, 22 Jan 2013 19:20:45 +0000 (11:20 -0800)]
Add missing extern "C".
Change-Id: Idbf24ce8482ff03f24caa89bafb08677b1c5cec3
Elliott Hughes [Tue, 22 Jan 2013 18:02:12 +0000 (10:02 -0800)]
am
75b64a1b: am
ca483765: Merge "Fix the duplication in the debugging code."
* commit '
75b64a1b64e788b9e69ac4f4cd8cce37932513a8':
Fix the duplication in the debugging code.
Elliott Hughes [Tue, 22 Jan 2013 17:59:44 +0000 (09:59 -0800)]
am
ca483765: Merge "Fix the duplication in the debugging code."
* commit '
ca483765bd0dc16294b9e67dd0de5c6d53b1bfa3':
Fix the duplication in the debugging code.
Elliott Hughes [Tue, 22 Jan 2013 17:44:15 +0000 (17:44 +0000)]
Merge "Fix the duplication in the debugging code."
Kito Cheng [Sat, 19 Jan 2013 16:15:15 +0000 (00:15 +0800)]
Add const for first argument of sigismember for fit POSIX spec
Change-Id: Icbc67375282f2a22dce02e4bacab15ddae846057
Elliott Hughes [Fri, 18 Jan 2013 02:36:06 +0000 (18:36 -0800)]
Fix the duplication in the debugging code.
We had two copies of the backtrace code, and two copies of the
libcorkscrew /proc/pid/maps code. This patch gets us down to one.
We also had hacks so we could log in the malloc debugging code.
This patch pulls the non-allocating "printf" code out of the
dynamic linker so everyone can share.
This patch also makes the leak diagnostics easier to read, and
makes it possible to paste them directly into the 'stack' tool (by
using relative PCs).
This patch also fixes the stdio standard stream leak that was
causing a leak warning every time tf_daemon ran.
Bug:
7291287
Change-Id: I66e4083ac2c5606c8d2737cb45c8ac8a32c7cfe8
Nick Kralevich [Fri, 18 Jan 2013 21:11:13 +0000 (13:11 -0800)]
am
f246ae98: am
5496bbf6: Merge "Revert "Filter ANDROID_PROPERTY_WORKSPACE""
* commit '
f246ae984baa133b93af4e14f94ba35990b43dbb':
Revert "Filter ANDROID_PROPERTY_WORKSPACE"
Nick Kralevich [Fri, 18 Jan 2013 21:10:04 +0000 (13:10 -0800)]
am
5496bbf6: Merge "Revert "Filter ANDROID_PROPERTY_WORKSPACE""
* commit '
5496bbf6a3592fd99cee6b8c20c8624c2aeea0c1':
Revert "Filter ANDROID_PROPERTY_WORKSPACE"
Nick Kralevich [Fri, 18 Jan 2013 20:50:40 +0000 (20:50 +0000)]
Merge "Revert "Filter ANDROID_PROPERTY_WORKSPACE""
Guang Zhu [Fri, 18 Jan 2013 07:25:24 +0000 (23:25 -0800)]
Revert "Filter ANDROID_PROPERTY_WORKSPACE"
Temporarily revert the change since DNS resolution seems
broken right now in ping util.
Bug:
8029617
This reverts commit
a0f64756a4a55ab48b2b5511d4e7c45583dac44b.
Nick Kralevich [Fri, 18 Jan 2013 01:06:11 +0000 (17:06 -0800)]
am
0a0c2321: am
4bfaf1e5: Merge "FORTIFY_SOURCE: optimize"
* commit '
0a0c23216766adf76739dc38dcb45934105cd41c':
FORTIFY_SOURCE: optimize
Nick Kralevich [Fri, 18 Jan 2013 01:04:33 +0000 (17:04 -0800)]
am
4bfaf1e5: Merge "FORTIFY_SOURCE: optimize"
* commit '
4bfaf1e5f62748b305406ff4ceebd5f4b750038c':
FORTIFY_SOURCE: optimize
Elliott Hughes [Fri, 18 Jan 2013 00:51:09 +0000 (16:51 -0800)]
am
261e9d08: am
e4ca88d9: Merge "Add functionlity to the scripts to replace tokens in kernel headers based on architecture."
* commit '
261e9d08dbf1cd7fea7e1799338238d11d18cb7c':
Add functionlity to the scripts to replace tokens in kernel headers based on architecture.
Nick Kralevich [Fri, 18 Jan 2013 00:49:35 +0000 (00:49 +0000)]
Merge "FORTIFY_SOURCE: optimize"
Elliott Hughes [Fri, 18 Jan 2013 00:48:45 +0000 (16:48 -0800)]
am
e4ca88d9: Merge "Add functionlity to the scripts to replace tokens in kernel headers based on architecture."
* commit '
e4ca88d9fa8757e4fb4056fcafa5bc15b406a2fd':
Add functionlity to the scripts to replace tokens in kernel headers based on architecture.
Elliott Hughes [Fri, 18 Jan 2013 00:34:13 +0000 (00:34 +0000)]
Merge "Add functionlity to the scripts to replace tokens in kernel headers based on architecture."
Nick Kralevich [Thu, 17 Jan 2013 23:41:33 +0000 (15:41 -0800)]
FORTIFY_SOURCE: optimize
Don't do the fortify_source checks if we can determine, at
compile time, that the provided operation is safe.
This avoids silliness like calling fortify source on things like:
size_t len = strlen("asdf");
printf("%d\n", len);
and allows the compiler to optimize this code to:
printf("%d\n", 4);
Defer to gcc's builtin functions instead of pointing our code
to the libc implementation.
Change-Id: I5e1dcb61946461c4afaaaa983e39f07c7a0df0ae
Raghu Gandham [Thu, 17 Jan 2013 00:42:47 +0000 (16:42 -0800)]
Add functionlity to the scripts to replace tokens in kernel headers
based on architecture.
Nick Kralevich [Thu, 17 Jan 2013 17:01:14 +0000 (09:01 -0800)]
am
3a72fe58: am
f3fe1945: Merge "linker: add -Wl,--exclude-libs,ALL to LDFLAGS"
* commit '
3a72fe587f454a2eea79b5564e4ab1d3880b51c8':
linker: add -Wl,--exclude-libs,ALL to LDFLAGS
Nick Kralevich [Thu, 17 Jan 2013 16:58:27 +0000 (08:58 -0800)]
am
f3fe1945: Merge "linker: add -Wl,--exclude-libs,ALL to LDFLAGS"
* commit '
f3fe19459fd9263e8cc8a413a5313b1ec3cf3975':
linker: add -Wl,--exclude-libs,ALL to LDFLAGS
Nick Kralevich [Thu, 17 Jan 2013 16:41:31 +0000 (16:41 +0000)]
Merge "linker: add -Wl,--exclude-libs,ALL to LDFLAGS"
Nick Kralevich [Thu, 17 Jan 2013 00:43:15 +0000 (16:43 -0800)]
linker: add -Wl,--exclude-libs,ALL to LDFLAGS
The linker is essentially a shared library, and incorporates
it's own copy of libc. Even though it's unnecessary, currently
/system/bin/linker is exporting various libc symbols (only to
apps which explicitly dlopen /system/bin/linker)
Add --exclude-libs,ALL, which tells the static linker to mark
all of the imported libc symbols as hidden. This reduces the
size of /system/bin/linker from 92K to 67K with no obvious
loss in functionality.
$ adb shell ls -l /system/bin/linker
-rwxrwxrwx root root 92260 2013-01-16 16:52 linker
$ adb shell ls -l /system/bin/linker
-rwxrwxrwx root root 67660 2013-01-16 16:49 linker
Documentation on exclude-libs can be found at
http://sourceware.org/binutils/docs-2.21/ld/Options.html
Change-Id: I4508287770e4b7a845def2e6b4af969f9c866c6a
Nick Kralevich [Wed, 16 Jan 2013 21:55:55 +0000 (13:55 -0800)]
am
8d01c055: am
1271cdc1: Merge "Revert "stack protector: use AT_RANDOM""
* commit '
8d01c0557bb2b7ea30f4038b6c84b816800073a7':
Revert "stack protector: use AT_RANDOM"
Nick Kralevich [Wed, 16 Jan 2013 21:53:25 +0000 (13:53 -0800)]
am
1271cdc1: Merge "Revert "stack protector: use AT_RANDOM""
* commit '
1271cdc1c91c6ae688917bc8f4ae59d2a97b3e99':
Revert "stack protector: use AT_RANDOM"
Nick Kralevich [Wed, 16 Jan 2013 21:36:53 +0000 (21:36 +0000)]
Merge "Revert "stack protector: use AT_RANDOM""
Nick Kralevich [Wed, 16 Jan 2013 21:31:24 +0000 (13:31 -0800)]
am
de666485: am
ba117e41: Merge "stack protector: use AT_RANDOM"
* commit '
de666485b8123ac35be94109336f7c56a7e9e3c2':
stack protector: use AT_RANDOM
Nick Kralevich [Wed, 16 Jan 2013 21:31:23 +0000 (13:31 -0800)]
am
30894bdf: am
1b34228b: Merge "Filter ANDROID_PROPERTY_WORKSPACE"
* commit '
30894bdfd6e4c74ab673d47391e62fb14fb51381':
Filter ANDROID_PROPERTY_WORKSPACE
Nick Kralevich [Wed, 16 Jan 2013 21:13:22 +0000 (13:13 -0800)]
Revert "stack protector: use AT_RANDOM"
The AT_RANDOM changes broke setuid / setgid executables
such as "ping". When the linker executes a setuid program,
it cleans the environment, removing any invalid environment
entries, and adding "NULL"s to the end of the environment
array for each removed variable. Later on, we try to determine
the location of the aux environment variable, and get tripped
up by these extra NULLs.
Reverting this patch will get setuid executables working again,
but getauxval() is still broken for setuid programs because of
this bug.
This reverts commit
e3a49a8661125f24aec8a1453e54b3b78005e21e.
Change-Id: I05c58a896b1fe32cfb5d95d43b096045cda0aa4a
Nick Kralevich [Wed, 16 Jan 2013 19:31:00 +0000 (11:31 -0800)]
am
ba117e41: Merge "stack protector: use AT_RANDOM"
* commit '
ba117e4172fe6f160bf5f4d58b37e12c08c34245':
stack protector: use AT_RANDOM
Nick Kralevich [Wed, 16 Jan 2013 19:23:25 +0000 (11:23 -0800)]
Merge "stack protector: use AT_RANDOM"
Nick Kralevich [Wed, 16 Jan 2013 19:14:01 +0000 (11:14 -0800)]
am
1b34228b: Merge "Filter ANDROID_PROPERTY_WORKSPACE"
* commit '
1b34228bb289723c4ba0534eae57d0d085a3d0fa':
Filter ANDROID_PROPERTY_WORKSPACE
Nick Kralevich [Wed, 16 Jan 2013 19:11:17 +0000 (11:11 -0800)]
Merge "Filter ANDROID_PROPERTY_WORKSPACE"
Elliott Hughes [Wed, 16 Jan 2013 18:34:33 +0000 (10:34 -0800)]
Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic.""
This reverts commit
f4b34b6c3942be273ad7298a40be0d312b183aab.
Nick Kralevich [Mon, 14 Jan 2013 22:46:26 +0000 (14:46 -0800)]
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
Elliott Hughes [Wed, 16 Jan 2013 17:48:04 +0000 (09:48 -0800)]
am
e611fad0: am
14e1975e: Merge "Fix signalfd for MIPS."
* commit '
e611fad0d055f2d869981136e5e51b7a01d525fc':
Fix signalfd for MIPS.
Elliott Hughes [Wed, 16 Jan 2013 17:45:57 +0000 (09:45 -0800)]
am
14e1975e: Merge "Fix signalfd for MIPS."
* commit '
14e1975e13c197180ed0481f305f83a362b16a24':
Fix signalfd for MIPS.
Elliott Hughes [Wed, 16 Jan 2013 17:42:51 +0000 (09:42 -0800)]
Merge "Fix signalfd for MIPS."
Elliott Hughes [Wed, 16 Jan 2013 17:34:16 +0000 (09:34 -0800)]
Fix signalfd for MIPS.
Also mark signalfd's sigset_t* argument as non-nullable.
Change-Id: I466e09cdf3fb92480744c496da92274a97f99dd1
Matthieu Castet [Wed, 16 Jan 2013 13:02:50 +0000 (14:02 +0100)]
arm syscall : for eabi call_default don't use stack
In the default case, we don't need to use the stack, we can save r7 with
ip register (that what does eglibc).
This allow to fix vfork data corruption
(see
3884bfe9661955543ce203c60f9225bbdf33f6bb), because vfork now don't
use the stack.
Nick Kralevich [Wed, 16 Jan 2013 00:02:03 +0000 (16:02 -0800)]
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
Elliott Hughes [Tue, 15 Jan 2013 21:37:56 +0000 (13:37 -0800)]
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.""
Elliott Hughes [Tue, 15 Jan 2013 21:35:58 +0000 (13:35 -0800)]
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.""
Elliott Hughes [Tue, 15 Jan 2013 21:21:51 +0000 (13:21 -0800)]
Merge "Revert "DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."""
Nick Kralevich [Tue, 15 Jan 2013 19:15:21 +0000 (11:15 -0800)]
am
b59e358b: Merge "fix strerror_r test"
* commit '
b59e358bb902124cc7d648266a97f96beefc8142':
fix strerror_r test
Elliott Hughes [Tue, 15 Jan 2013 19:12:18 +0000 (11:12 -0800)]
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.
Nick Kralevich [Tue, 15 Jan 2013 18:56:06 +0000 (10:56 -0800)]
Merge "fix strerror_r test"
Nick Kralevich [Tue, 15 Jan 2013 18:35:09 +0000 (10:35 -0800)]
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
Ben Cheng [Mon, 14 Jan 2013 23:44:01 +0000 (15:44 -0800)]
am
b09d7d86: Merge "Add __aeabi_idiv to the dummy reference list."
* commit '
b09d7d86004ab75b774358454d8ee261987af96b':
Add __aeabi_idiv to the dummy reference list.
Ben Cheng [Mon, 14 Jan 2013 23:35:03 +0000 (15:35 -0800)]
Merge "Add __aeabi_idiv to the dummy reference list."
Ben Cheng [Mon, 14 Jan 2013 19:26:51 +0000 (11:26 -0800)]
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
Nick Kralevich [Mon, 14 Jan 2013 22:31:28 +0000 (14:31 -0800)]
am
29fe857e: Merge "headers: update auxvec.h from Linux kernel"
* commit '
29fe857ec80e59347e28458a5396eb68d1cba0e4':
headers: update auxvec.h from Linux kernel