Nick Kralevich
98ae1a85b0
am e652ed30
: am 244bee5b
: Merge "bionic_auxv.h: fix #define conflict"
...
* commit 'e652ed30514afcf314b40c69b9cac088602a83da':
bionic_auxv.h: fix #define conflict
2013-01-22 13:43:46 -08:00
Nick Kralevich
e652ed3051
am 244bee5b
: Merge "bionic_auxv.h: fix #define conflict"
...
* commit '244bee5bb6e0bc12b739c57028ac8af23a18aed0':
bionic_auxv.h: fix #define conflict
2013-01-22 13:38:53 -08:00
Nick Kralevich
244bee5bb6
Merge "bionic_auxv.h: fix #define conflict"
2013-01-22 21:30:27 +00:00
Nick Kralevich
25e3f4a90d
Merge "Revert "libc: make system properties more secure.""
2013-01-22 21:26:18 +00:00
Nick Kralevich
abc21c8056
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
2013-01-22 13:09:04 -08:00
Nick Kralevich
8897a9565a
Revert "libc: make system properties more secure."
...
This reverts commit f10c5a2215
.
Bug: 8045561
2013-01-22 12:44:11 -08:00
Elliott Hughes
f669fdf11e
am 04afcd25
: am 8ef83bc4
: am 02f96b9d
: Merge "Add missing extern "C"."
...
* commit '04afcd25a3758090009d3261f4c573b8ed73e03a':
Add missing extern "C".
2013-01-22 11:35:50 -08:00
Elliott Hughes
04afcd25a3
am 8ef83bc4
: am 02f96b9d
: Merge "Add missing extern "C"."
...
* commit '8ef83bc46e06e8fe98e918fcb1c582d6f5807461':
Add missing extern "C".
2013-01-22 11:34:25 -08:00
Elliott Hughes
8ef83bc46e
am 02f96b9d
: Merge "Add missing extern "C"."
...
* commit '02f96b9db0242711fe1dfe0713c0c4e698561da5':
Add missing extern "C".
2013-01-22 11:32:16 -08:00
Elliott Hughes
02f96b9db0
Merge "Add missing extern "C"."
2013-01-22 19:22:47 +00:00
Elliott Hughes
f90b95ea1a
Add missing extern "C".
...
Change-Id: Idbf24ce8482ff03f24caa89bafb08677b1c5cec3
2013-01-22 11:20:45 -08:00
Elliott Hughes
16f7b78fd1
am 4cd5703b
: am 75b64a1b
: am ca483765
: Merge "Fix the duplication in the debugging code."
...
* commit '4cd5703b9eef30a32271819503808576666e1601':
Fix the duplication in the debugging code.
2013-01-22 10:05:19 -08:00
Elliott Hughes
4cd5703b9e
am 75b64a1b
: am ca483765
: Merge "Fix the duplication in the debugging code."
...
* commit '75b64a1b64e788b9e69ac4f4cd8cce37932513a8':
Fix the duplication in the debugging code.
2013-01-22 10:02:12 -08:00
Elliott Hughes
75b64a1b64
am ca483765
: Merge "Fix the duplication in the debugging code."
...
* commit 'ca483765bd0dc16294b9e67dd0de5c6d53b1bfa3':
Fix the duplication in the debugging code.
2013-01-22 09:59:44 -08:00
Elliott Hughes
ca483765bd
Merge "Fix the duplication in the debugging code."
2013-01-22 17:44:15 +00:00
Kito Cheng
f373b11f9f
Add const for first argument of sigismember for fit POSIX spec
...
Change-Id: Icbc67375282f2a22dce02e4bacab15ddae846057
2013-01-20 00:15:23 +08:00
Elliott Hughes
1e980b6bc8
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
2013-01-18 22:20:06 -08:00
Robert Greenwalt
1136b7d821
Merge "Revert "dns cache per interface iteration 2""
2013-01-19 00:40:38 +00:00
Robert Greenwalt
b002a2ff77
Revert "dns cache per interface iteration 2"
...
This reverts commit f1464ff956
Change-Id: I3496b9a8cb54614fe3eea016d1391c8a89f3db38
2013-01-19 00:40:24 +00:00
Geremy Condra
b1d1a7682f
Merge "libc: make system properties more secure."
2013-01-19 00:26:23 +00:00
Nick Kralevich
f10c5a2215
libc: make system properties more secure.
...
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.
Related to bug: 8029617
Change-Id: I5717e51f20f9e4339ed0a1fdf2fc797e52670fbb
2013-01-18 14:30:07 -08:00
Nick Kralevich
c82bc4f472
am 9468ee53
: am f246ae98
: am 5496bbf6
: Merge "Revert "Filter ANDROID_PROPERTY_WORKSPACE""
...
* commit '9468ee53ac01a86255bd00976d8aa5a1a4141020':
Revert "Filter ANDROID_PROPERTY_WORKSPACE"
2013-01-18 14:01:54 -08:00
Nick Kralevich
9468ee53ac
am f246ae98
: am 5496bbf6
: Merge "Revert "Filter ANDROID_PROPERTY_WORKSPACE""
...
* commit 'f246ae984baa133b93af4e14f94ba35990b43dbb':
Revert "Filter ANDROID_PROPERTY_WORKSPACE"
2013-01-18 13:11:13 -08:00
Nick Kralevich
f246ae984b
am 5496bbf6
: Merge "Revert "Filter ANDROID_PROPERTY_WORKSPACE""
...
* commit '5496bbf6a3592fd99cee6b8c20c8624c2aeea0c1':
Revert "Filter ANDROID_PROPERTY_WORKSPACE"
2013-01-18 13:10:04 -08:00
Nick Kralevich
5496bbf6a3
Merge "Revert "Filter ANDROID_PROPERTY_WORKSPACE""
2013-01-18 20:50:41 +00:00
Guang Zhu
4df577fef7
Revert "Filter ANDROID_PROPERTY_WORKSPACE"
...
Temporarily revert the change since DNS resolution seems
broken right now in ping util.
Bug: 8029617
This reverts commit a0f64756a4
.
2013-01-18 11:28:47 -08:00
Guang Zhu
bf1d225593
Revert "Filter ANDROID_PROPERTY_WORKSPACE"
...
Temporarily revert the change since DNS resolution seems
broken right now in ping util.
Bug: 8029617
This reverts commit a0f64756a4
.
2013-01-17 23:25:24 -08:00
Nick Kralevich
c5c99adeed
am 8e833972
: am 0a0c2321
: am 4bfaf1e5
: Merge "FORTIFY_SOURCE: optimize"
...
* commit '8e833972c2506267024136a0f609bdbb26dcc498':
FORTIFY_SOURCE: optimize
2013-01-17 17:08:21 -08:00
Nick Kralevich
8e833972c2
am 0a0c2321
: am 4bfaf1e5
: Merge "FORTIFY_SOURCE: optimize"
...
* commit '0a0c23216766adf76739dc38dcb45934105cd41c':
FORTIFY_SOURCE: optimize
2013-01-17 17:06:11 -08:00
Nick Kralevich
0a0c232167
am 4bfaf1e5
: Merge "FORTIFY_SOURCE: optimize"
...
* commit '4bfaf1e5f62748b305406ff4ceebd5f4b750038c':
FORTIFY_SOURCE: optimize
2013-01-17 17:04:33 -08:00
Elliott Hughes
e230306135
am a4723742
: am 261e9d08
: am e4ca88d9
: Merge "Add functionlity to the scripts to replace tokens in kernel headers based on architecture."
...
* commit 'a4723742c1ee0daa2ec17a148334c548b5edf3a8':
Add functionlity to the scripts to replace tokens in kernel headers based on architecture.
2013-01-17 16:53:57 -08:00
Elliott Hughes
a4723742c1
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.
2013-01-17 16:51:09 -08:00
Nick Kralevich
4bfaf1e5f6
Merge "FORTIFY_SOURCE: optimize"
2013-01-18 00:49:36 +00:00
Elliott Hughes
261e9d08db
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.
2013-01-17 16:48:45 -08:00
Elliott Hughes
e4ca88d9fa
Merge "Add functionlity to the scripts to replace tokens in kernel headers based on architecture."
2013-01-18 00:34:13 +00:00
Nick Kralevich
a44e9afdd1
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
2013-01-17 15:41:33 -08:00
Raghu Gandham
a864c2c234
Add functionlity to the scripts to replace tokens in kernel headers
...
based on architecture.
2013-01-17 14:39:09 -08:00
Nick Kralevich
dbcf3ed458
am 36c4eb18
: am 3a72fe58
: am f3fe1945
: Merge "linker: add -Wl,--exclude-libs,ALL to LDFLAGS"
...
* commit '36c4eb188c6594db877bd7b9f46c55264180dc3f':
linker: add -Wl,--exclude-libs,ALL to LDFLAGS
2013-01-17 11:34:20 -08:00
Nick Kralevich
36c4eb188c
am 3a72fe58
: am f3fe1945
: Merge "linker: add -Wl,--exclude-libs,ALL to LDFLAGS"
...
* commit '3a72fe587f454a2eea79b5564e4ab1d3880b51c8':
linker: add -Wl,--exclude-libs,ALL to LDFLAGS
2013-01-17 09:01:14 -08:00
Nick Kralevich
3a72fe587f
am f3fe1945
: Merge "linker: add -Wl,--exclude-libs,ALL to LDFLAGS"
...
* commit 'f3fe19459fd9263e8cc8a413a5313b1ec3cf3975':
linker: add -Wl,--exclude-libs,ALL to LDFLAGS
2013-01-17 08:58:27 -08:00
Nick Kralevich
f3fe19459f
Merge "linker: add -Wl,--exclude-libs,ALL to LDFLAGS"
2013-01-17 16:41:31 +00:00
Robert Greenwalt
89f9b30e4d
Merge "dns cache per interface iteration 2"
2013-01-17 16:14:52 +00:00
Nick Kralevich
d89ce40d8e
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
2013-01-16 16:43:58 -08:00
Nick Kralevich
927d904d52
am 91bc5865
: am 8d01c055
: am 1271cdc1
: Merge "Revert "stack protector: use AT_RANDOM""
...
* commit '91bc5865a333212e7cac934b0a2ac7c522911d58':
Revert "stack protector: use AT_RANDOM"
2013-01-16 13:58:04 -08:00
Nick Kralevich
91bc5865a3
am 8d01c055
: am 1271cdc1
: Merge "Revert "stack protector: use AT_RANDOM""
...
* commit '8d01c0557bb2b7ea30f4038b6c84b816800073a7':
Revert "stack protector: use AT_RANDOM"
2013-01-16 13:55:55 -08:00
Nick Kralevich
8d01c0557b
am 1271cdc1
: Merge "Revert "stack protector: use AT_RANDOM""
...
* commit '1271cdc1c91c6ae688917bc8f4ae59d2a97b3e99':
Revert "stack protector: use AT_RANDOM"
2013-01-16 13:53:25 -08:00
Nick Kralevich
1271cdc1c9
Merge "Revert "stack protector: use AT_RANDOM""
2013-01-16 21:36:53 +00:00
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