OSDN Git Service
Elliott Hughes [Wed, 30 Jan 2013 01:09:11 +0000 (17:09 -0800)]
am
a7f44b5a: am
172e038f: am
f09f6db5: Merge "Use the NetBSD <sys/exec_elf.h>."
# Via Android Git Automerger (2) and others
* commit '
a7f44b5afe64199eeee715e613c7d42d2724232c':
Use the NetBSD <sys/exec_elf.h>.
Elliott Hughes [Wed, 30 Jan 2013 01:04:11 +0000 (17:04 -0800)]
am
172e038f: am
f09f6db5: Merge "Use the NetBSD <sys/exec_elf.h>."
# Via Android Git Automerger (1) and others
* commit '
172e038f9e5b711a77afe7e8899343215cf25c9e':
Use the NetBSD <sys/exec_elf.h>.
Elliott Hughes [Wed, 30 Jan 2013 00:26:10 +0000 (16:26 -0800)]
am
f09f6db5: Merge "Use the NetBSD <sys/exec_elf.h>."
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '
f09f6db5dd87856bbbb7a3d465187b9d8799a788':
Use the NetBSD <sys/exec_elf.h>.
Elliott Hughes [Wed, 30 Jan 2013 00:06:11 +0000 (00:06 +0000)]
Merge "Use the NetBSD <sys/exec_elf.h>."
Elliott Hughes [Tue, 29 Jan 2013 23:02:50 +0000 (15:02 -0800)]
Use the NetBSD <sys/exec_elf.h>.
Replace a kernel header file dependency with files from NetBSD.
They're more complete, and ELF is ELF, whether you're on Linux or a BSD.
Bug:
7973611
Change-Id: I83ee719e7efdf432ec2ddbe8be271d05b2f558d7
Elliott Hughes [Tue, 29 Jan 2013 20:09:31 +0000 (12:09 -0800)]
am
f5d6238c: am
3f20ecc2: am
3db2fc5a: Merge "Don\'t collect useless stack frames; do demangle C++ symbols."
# Via Android Git Automerger (2) and others
* commit '
f5d6238c4b6433f193c6d06c1dd89110b497e449':
Don't collect useless stack frames; do demangle C++ symbols.
Elliott Hughes [Tue, 29 Jan 2013 20:07:13 +0000 (12:07 -0800)]
am
3f20ecc2: am
3db2fc5a: Merge "Don\'t collect useless stack frames; do demangle C++ symbols."
# Via Android Git Automerger (1) and others
* commit '
3f20ecc20486ae8fe8d9332102b503135f83c62d':
Don't collect useless stack frames; do demangle C++ symbols.
Elliott Hughes [Tue, 29 Jan 2013 20:03:53 +0000 (12:03 -0800)]
am
3db2fc5a: Merge "Don\'t collect useless stack frames; do demangle C++ symbols."
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '
3db2fc5acb4894a2cb22533b165a0de1bbafc3f6':
Don't collect useless stack frames; do demangle C++ symbols.
Elliott Hughes [Tue, 29 Jan 2013 19:59:30 +0000 (19:59 +0000)]
Merge "Don't collect useless stack frames; do demangle C++ symbols."
Elliott Hughes [Tue, 29 Jan 2013 00:27:36 +0000 (16:27 -0800)]
Don't collect useless stack frames; do demangle C++ symbols.
Previously, we'd collect every stack frame and then throw some away
when we came to log them. This meant that stack traces were effectively
shorter than the buffers that had been allocated for them. This patch
only stores frames we'll actually output.
Also dynamically call the C++ demangler so we don't have to try to
read mangled names. Because no one knows the mangling of operator new[]
for int arrays off the top of their head.
Bug:
7291287
Change-Id: I42b022fd7cd61675d05171de4c3b2704d058ef2a
Elliott Hughes [Mon, 28 Jan 2013 22:14:44 +0000 (14:14 -0800)]
am
2218b89c: am
d383ac15: am
a0151cbf: Merge "Unit tests for formatting code, fix %%."
# Via Android Git Automerger (2) and others
* commit '
2218b89ca7017e3f1cdb0641528787cd9985501a':
Unit tests for formatting code, fix %%.
Elliott Hughes [Mon, 28 Jan 2013 22:11:54 +0000 (14:11 -0800)]
am
d383ac15: am
a0151cbf: Merge "Unit tests for formatting code, fix %%."
# Via Android Git Automerger (1) and others
* commit '
d383ac1570b553d68ed399c74b73bad1498d78f6':
Unit tests for formatting code, fix %%.
Elliott Hughes [Mon, 28 Jan 2013 22:10:08 +0000 (14:10 -0800)]
am
a0151cbf: Merge "Unit tests for formatting code, fix %%."
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '
a0151cbfbaa37965dbcd188a55a78d3ad4802b9b':
Unit tests for formatting code, fix %%.
Elliott Hughes [Mon, 28 Jan 2013 22:04:44 +0000 (22:04 +0000)]
Merge "Unit tests for formatting code, fix %%."
Elliott Hughes [Mon, 28 Jan 2013 18:36:31 +0000 (10:36 -0800)]
Unit tests for formatting code, fix %%.
Also fix <signal.h> and <stdio.h> so they don't cause compiler warnings.
Change-Id: Ib1a746bf01de22d47dbd964de0e6af80a7c96303
Elliott Hughes [Sat, 26 Jan 2013 02:11:55 +0000 (18:11 -0800)]
am
d265d367: am
f07db754: am
0a91b11d: Merge "More debug malloc fixes."
# Via Android Git Automerger (2) and others
* commit '
d265d3674937651d23a0252e6aad0ee09b02492a':
More debug malloc fixes.
Elliott Hughes [Sat, 26 Jan 2013 02:09:45 +0000 (18:09 -0800)]
am
f07db754: am
0a91b11d: Merge "More debug malloc fixes."
# Via Android Git Automerger (1) and others
* commit '
f07db75443cce4ab96c93bdaa0793d7b8e87547e':
More debug malloc fixes.
Elliott Hughes [Sat, 26 Jan 2013 02:07:23 +0000 (18:07 -0800)]
am
0a91b11d: Merge "More debug malloc fixes."
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '
0a91b11d286446fe7849a6f537b4a21a52f63399':
More debug malloc fixes.
Elliott Hughes [Sat, 26 Jan 2013 01:55:43 +0000 (01:55 +0000)]
Merge "More debug malloc fixes."
Iliyan Malchev [Sat, 26 Jan 2013 01:41:55 +0000 (01:41 +0000)]
Merge "bionic: update processed msm_vidc_enc.h"
Elliott Hughes [Sat, 26 Jan 2013 01:13:45 +0000 (17:13 -0800)]
More debug malloc fixes.
Include the leaky executable's name in the log output. Fix the "sh" test.
Use uintptr_t instead of intptr_t.
Also fix debug formatting of NULL with %s.
Bug:
7291287
Change-Id: I015bf341cd48d43a247173612e6ccb1bf1243d53
Elliott Hughes [Sat, 26 Jan 2013 01:11:52 +0000 (17:11 -0800)]
am
88af7232: am
7ae99845: am
6a94cb74: Merge "arm syscall : for eabi call_default don\'t use stack"
# By Matthieu Castet
# Via Android Git Automerger (2) and others
* commit '
88af723267e86c7b2a685f97c6e442d3766ad9a9':
arm syscall : for eabi call_default don't use stack
Nick Kralevich [Sat, 26 Jan 2013 01:11:51 +0000 (17:11 -0800)]
am
2ebcd19c: am
27818d2a: am
b871e5d6: Merge "system_properties: do more checking of file"
# Via Android Git Automerger (2) and others
* commit '
2ebcd19cbc42c5edce189df630a48feb9ffec16d':
system_properties: do more checking of file
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
Iliyan Malchev [Fri, 25 Jan 2013 19:26:53 +0000 (11:26 -0800)]
bionic: update processed msm_vidc_enc.h
Change-Id: If9aeec6f43b8b2951d1372042c884cd0e01f0a5a
Signed-off-by: Iliyan Malchev <malchev@google.com>
Nick Kralevich [Fri, 25 Jan 2013 00:15:39 +0000 (16:15 -0800)]
am
151e91e6: am
da2d2c61: am
82ef8296: Merge "prctl.h: include sys/cdefs.h"
# Via Android Git Automerger (2) and others
* commit '
151e91e66c95a7e415903b87b8157a9bc422df45':
prctl.h: include sys/cdefs.h
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:12:07 +0000 (11:12 -0800)]
am
b8726037: am
e7d937b5: am
b3351f12: Merge "libc: use more secure system properties if available"
* commit '
b8726037ee1100e2704e90d0a54ea2313bf96b00':
libc: use more secure system properties if available
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:16:11 +0000 (22:16 -0800)]
am
c08ab018: am
40107623: am
778a68e1: Merge "Don\'t free anything when reporting leaks."
* commit '
c08ab018ad133a4e177013d79be547fd55968eac':
Don't free anything when reporting leaks.
Elliott Hughes [Wed, 23 Jan 2013 06:16:10 +0000 (22:16 -0800)]
am
ce8732b1: am
552e02fa: am
5c8f75ef: Merge "Disable leak checking for mksh; it\'s way too leaky."
* commit '
ce8732b188d96f4c313d20e6be17362a508f572d':
Disable leak checking for mksh; it's way too leaky.
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:31:20 +0000 (17:31 -0800)]
am
a8e0f2b9: am
b16ec162: am
28f82b26: Merge "Add const for first argument of sigismember for fit POSIX spec"
* commit '
a8e0f2b956b5a31311d778b478e63093bc2cac7a':
Add const for first argument of sigismember for fit POSIX spec
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:36:26 +0000 (15:36 -0800)]
am
5f79f75b: am
57edf36c: am
8d6302cd: Merge "Our strcoll(3) is no different from NetBSD\'s, so take exactly theirs."
* commit '
5f79f75ba6241ca9cab42e69a68d66d1ca28e031':
Our strcoll(3) is no different from NetBSD's, so take exactly theirs.
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:23:53 +0000 (15:23 -0800)]
am
ad551eaa: am
5f7b6b83: am
547eba0a: Merge "Avoid overflow in memccpy."
* commit '
ad551eaa0429bf5085f2901c5d367e8a54b7ed16':
Avoid overflow in memccpy.
Elliott Hughes [Tue, 22 Jan 2013 23:23:49 +0000 (15:23 -0800)]
am
1029364e: am
e8e1f34a: am
85597e2b: Merge "Clean up debuggerd-related logging."
* commit '
1029364ec5710755164ec9a7f0fe625cc184bb60':
Clean up debuggerd-related logging.
Elliott Hughes [Tue, 22 Jan 2013 23:23:48 +0000 (15:23 -0800)]
am
0dfb2eca: am
0609c0fe: am
7af7895e: Merge "Use the new non-allocating logging for dlmalloc failures."
* commit '
0dfb2ecaab681e27fa81462daec9882ebcf36edc':
Use the new non-allocating logging for dlmalloc failures.
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:46:31 +0000 (13:46 -0800)]
am
98ae1a85: am
e652ed30: am
244bee5b: Merge "bionic_auxv.h: fix #define conflict"
* commit '
98ae1a85b057f6534bee7e52897a80694ba8b2e1':
bionic_auxv.h: fix #define conflict
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:26:18 +0000 (21:26 +0000)]
Merge "Revert "libc: make system properties more secure.""
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
Nick Kralevich [Tue, 22 Jan 2013 20:44:11 +0000 (12:44 -0800)]
Revert "libc: make system properties more secure."
This reverts commit
f10c5a2215b3da2e226e8bd148c86e2c146d8e90.
Bug:
8045561
Elliott Hughes [Tue, 22 Jan 2013 19:35:50 +0000 (11:35 -0800)]
am
04afcd25: am
8ef83bc4: am
02f96b9d: Merge "Add missing extern "C"."
* commit '
04afcd25a3758090009d3261f4c573b8ed73e03a':
Add missing extern "C".
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:05:19 +0000 (10:05 -0800)]
am
4cd5703b: am
75b64a1b: am
ca483765: Merge "Fix the duplication in the debugging code."
* commit '
4cd5703b9eef30a32271819503808576666e1601':
Fix the duplication in the debugging code.
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
Robert Greenwalt [Sat, 19 Jan 2013 00:40:38 +0000 (00:40 +0000)]
Merge "Revert "dns cache per interface iteration 2""
Robert Greenwalt [Sat, 19 Jan 2013 00:40:24 +0000 (00:40 +0000)]
Revert "dns cache per interface iteration 2"
This reverts commit
f1464ff95670e6dcc0e12bf9fbbeb4c0346434c9
Change-Id: I3496b9a8cb54614fe3eea016d1391c8a89f3db38
Geremy Condra [Sat, 19 Jan 2013 00:26:23 +0000 (00:26 +0000)]
Merge "libc: make system properties more secure."
Nick Kralevich [Fri, 18 Jan 2013 22:26:55 +0000 (14:26 -0800)]
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
Nick Kralevich [Fri, 18 Jan 2013 22:01:54 +0000 (14:01 -0800)]
am
9468ee53: am
f246ae98: am
5496bbf6: Merge "Revert "Filter ANDROID_PROPERTY_WORKSPACE""
* commit '
9468ee53ac01a86255bd00976d8aa5a1a4141020':
Revert "Filter ANDROID_PROPERTY_WORKSPACE"
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"