OSDN Git Service

android-x86/bionic.git
12 years agoam 4d0128f1: Merge "Minor tweak to get memory around corrupted heap chunks dumped...
Andy McFadden [Tue, 19 Jun 2012 18:31:14 +0000 (11:31 -0700)]
am 4d0128f1: Merge "Minor tweak to get memory around corrupted heap chunks dumped." into jb-dev

* commit '4d0128f13a3ca9f7a0c81b6e69f7e20d28e9e6e3':
  Minor tweak to get memory around corrupted heap chunks dumped.

12 years agoMerge "Minor tweak to get memory around corrupted heap chunks dumped." into jb-dev
Andy McFadden [Tue, 19 Jun 2012 18:28:15 +0000 (11:28 -0700)]
Merge "Minor tweak to get memory around corrupted heap chunks dumped." into jb-dev

12 years agoMinor tweak to get memory around corrupted heap chunks dumped.
Ben Cheng [Tue, 19 Jun 2012 14:11:38 +0000 (07:11 -0700)]
Minor tweak to get memory around corrupted heap chunks dumped.

Change-Id: I8f72c5c7e23960b13fc53e2354cd74aca8aac3c0

12 years agoam 028ccf5d: Merge "Avoid multiple dns lookups for the same query"
Robert Greenwalt [Tue, 12 Jun 2012 22:52:56 +0000 (15:52 -0700)]
am 028ccf5d: Merge "Avoid multiple dns lookups for the same query"

* commit '028ccf5d40dd9a945ea92aa79822c08c6f6aa1d2':
  Avoid multiple dns lookups for the same query

12 years agoMerge "Avoid multiple dns lookups for the same query"
Robert Greenwalt [Tue, 12 Jun 2012 22:06:23 +0000 (15:06 -0700)]
Merge "Avoid multiple dns lookups for the same query"

12 years agoam e0961445: Merge "Remove the meaningless on Linux if_dl.h header."
Elliott Hughes [Tue, 12 Jun 2012 00:41:10 +0000 (17:41 -0700)]
am e0961445: Merge "Remove the meaningless on Linux if_dl.h header."

* commit 'e0961445124b5ff39412da32578e14e0d1f6afd6':
  Remove the meaningless on Linux if_dl.h header.

12 years agoam c75491e2: Merge "Remove an obsolete jamfile."
Elliott Hughes [Tue, 12 Jun 2012 00:41:04 +0000 (17:41 -0700)]
am c75491e2: Merge "Remove an obsolete jamfile."

* commit 'c75491e291586540c213ae088fc75b71fc4d3752':
  Remove an obsolete jamfile.

12 years agoMerge "Remove the meaningless on Linux if_dl.h header."
Elliott Hughes [Mon, 11 Jun 2012 23:49:57 +0000 (16:49 -0700)]
Merge "Remove the meaningless on Linux if_dl.h header."

12 years agoMerge "Remove an obsolete jamfile."
Elliott Hughes [Mon, 11 Jun 2012 23:29:46 +0000 (16:29 -0700)]
Merge "Remove an obsolete jamfile."

12 years agoRemove an obsolete jamfile.
Elliott Hughes [Mon, 11 Jun 2012 23:17:45 +0000 (16:17 -0700)]
Remove an obsolete jamfile.

Was bionic ever built with jam? Weird!

Change-Id: Iea9a7af8bf46ee8319963e642da48e3bb49f6c60

12 years agoRemove the meaningless on Linux if_dl.h header.
Elliott Hughes [Mon, 11 Jun 2012 22:01:10 +0000 (15:01 -0700)]
Remove the meaningless on Linux if_dl.h header.

This was misleading 'configure' into thinking we actually support AF_LINK,
but we're Linux, so we don't, and we never implemented the functions we
declared here either.

Reported to AOSP by Jun-ya Kato.

(cherry-pick of 5056f1fad1187cd67729bb04ba72397d78256f03.)

Change-Id: Ic67f674d2221497c8166994812bb5fc7f0831066

12 years agoReconcile with jb-release
The Android Open Source Project [Mon, 11 Jun 2012 16:20:36 +0000 (09:20 -0700)]
Reconcile with jb-release

Change-Id: I7cbfbab55783f245c0854543843c2052c4c2e932

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Mon, 11 Jun 2012 13:59:25 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoam b7630f01: Use new debuggerd protocol.
Jeff Brown [Fri, 8 Jun 2012 22:30:39 +0000 (15:30 -0700)]
am b7630f01: Use new debuggerd protocol.

* commit 'b7630f018abc83261acf78e8cf9a88c1df72f7f5':
  Use new debuggerd protocol.

12 years agoReconcile with jb-release
The Android Open Source Project [Thu, 7 Jun 2012 14:48:47 +0000 (07:48 -0700)]
Reconcile with jb-release

Change-Id: I2c8264a9a4e3299bca7fc01d67063993b6b1b886

12 years agoUse new debuggerd protocol.
Jeff Brown [Thu, 7 Jun 2012 01:37:48 +0000 (18:37 -0700)]
Use new debuggerd protocol.

Bug: 6615693
Change-Id: Ibfddc0de3fa2a882f7d0238ab797e5b29296b54b

12 years agoam 2b89f1e3: Merge "Fix sysconf(_SC_NPROCESSORS_CONF) on ARM."
Elliott Hughes [Wed, 6 Jun 2012 20:48:07 +0000 (13:48 -0700)]
am 2b89f1e3: Merge "Fix sysconf(_SC_NPROCESSORS_CONF) on ARM."

* commit '2b89f1e37df838e466d382fc602728930bad4c68':
  Fix sysconf(_SC_NPROCESSORS_CONF) on ARM.

12 years agoMerge "Fix sysconf(_SC_NPROCESSORS_CONF) on ARM."
Elliott Hughes [Wed, 6 Jun 2012 20:32:19 +0000 (13:32 -0700)]
Merge "Fix sysconf(_SC_NPROCESSORS_CONF) on ARM."

12 years agoFix sysconf(_SC_NPROCESSORS_CONF) on ARM.
Elliott Hughes [Wed, 6 Jun 2012 19:04:38 +0000 (12:04 -0700)]
Fix sysconf(_SC_NPROCESSORS_CONF) on ARM.

Bug: http://code.google.com/p/enh/issues/detail?id=33
Change-Id: I679b4cd888d362031042284e8edf01c5273a92aa

12 years agoam c2bba24d: Merge "Give the timer_create SIGEV_THREAD helper threads sensible names."
Elliott Hughes [Wed, 6 Jun 2012 18:35:32 +0000 (11:35 -0700)]
am c2bba24d: Merge "Give the timer_create SIGEV_THREAD helper threads sensible names."

* commit 'c2bba24d0a6b906f00d7b9f20ac9d32d63bb2e9d':
  Give the timer_create SIGEV_THREAD helper threads sensible names.

12 years agoMerge "Give the timer_create SIGEV_THREAD helper threads sensible names."
Elliott Hughes [Wed, 6 Jun 2012 17:44:31 +0000 (10:44 -0700)]
Merge "Give the timer_create SIGEV_THREAD helper threads sensible names."

12 years agoGive the timer_create SIGEV_THREAD helper threads sensible names.
Elliott Hughes [Wed, 6 Jun 2012 17:32:56 +0000 (10:32 -0700)]
Give the timer_create SIGEV_THREAD helper threads sensible names.

Bug: 6609676
Change-Id: I286b197c75beee4d9930b0973f2d7dd47c14e91c

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Sun, 3 Jun 2012 12:59:30 +0000 (05:59 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoresolved conflicts for merge of e1dd3c28 to jb-dev-plus-aosp
Iliyan Malchev [Sat, 2 Jun 2012 15:14:36 +0000 (08:14 -0700)]
resolved conflicts for merge of e1dd3c28 to jb-dev-plus-aosp

Change-Id: I58b9c13d20771aa39b703ec05cbff8aeaad38fe8

12 years agoam 7d2e24eb: bionic: introduce libc.debug.malloc.program
Iliyan Malchev [Sat, 2 Jun 2012 02:03:06 +0000 (19:03 -0700)]
am 7d2e24eb: bionic: introduce libc.debug.malloc.program

* commit '7d2e24eb167b6257f7935c7bd2023a708704ca1a':
  bionic: introduce libc.debug.malloc.program

12 years agobionic: import heaptracker as chk_malloc
Iliyan Malchev [Tue, 29 May 2012 21:22:42 +0000 (14:22 -0700)]
bionic: import heaptracker as chk_malloc

This patch is a rewrite of libc.debug.malloc = 10 (chk_malloc).  It provides
the same features as the original (poison freed memory, detect heap overruns
and underruns), except that it provides more debugging information whenever it
detects a problem.

In addition to the original features, the new chk_malloc() implementation
detects multiple frees within a given range of the last N allocations, N being
configurable via the system property libc.debug.malloc.backlog.

Finally, this patch keeps track of all outstanding memory allocations.  On
program exit, we walk that list and report each outstanding allocation.

(There is support (not enabled) for a scanner thread periodically walks over
the list of outstanding allocations as well as the backlog of recently-freed
allocations, checking for heap-usage errors.)

Feature overview:

  1) memory leaks
  2) multiple frees
  3) use after free
  4) overrun

Implementation:

-- for each allocation, there is a:
  1) stack trace at the time the allocation is made
  2) if the memory is freed, there is also a stack trace at the point
  3) a front and rear guard (fence)
  4) the stack traces are kept together with the allocation

-- the following lists and maintained

  1) all outstanding memory allocations
  3) a backlog of allocations what are freed; when you call free(), instead of
     actually freed, the allocation is moved to this backlog;
  4) when the backlog of allocations gets full, the oldest entry gets evicted
     from it; at that point, the allocation is checked for overruns or
     use-after-free errors, and then actually freed.
  5) when the program exits, the list of outstanding allocations and the
     backlog are inspected for errors, then freed;

To use this, set the following system properties before running the process or
processes you want to inspect:

libc.malloc.debug.backlog # defaults to 100
libc.malloc.debug 10

When a problem is detected, you will see the following on logcat for a multiple
free:

E/libc    ( 7233): +++ ALLOCATION 0x404b9278 SIZE 10 BYTES MULTIPLY FREED!
E/libc    ( 7233): +++ ALLOCATION 0x404b9278 SIZE 10 ALLOCATED HERE:
E/libc    ( 7233): *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
E/libc    ( 7233):      #00  pc 0000c35a  /system/lib/libc_malloc_debug_leak.so
E/libc    ( 7233):      #01  pc 0000c658  /system/lib/libc_malloc_debug_leak.so
E/libc    ( 7233):      #02  pc 00016d80  /system/lib/libc.so
E/libc    ( 7233):      #03  pc 4009647c  /system/bin/malloctest
E/libc    ( 7233):      #04  pc 00016f24  /system/lib/libc.so
E/libc    ( 7233): +++ ALLOCATION 0x404b9278 SIZE 10 FIRST FREED HERE:
E/libc    ( 7233): *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
E/libc    ( 7233):      #00  pc 0000c35a  /system/lib/libc_malloc_debug_leak.so
E/libc    ( 7233):      #01  pc 0000c7d2  /system/lib/libc_malloc_debug_leak.so
E/libc    ( 7233):      #02  pc 00016d94  /system/lib/libc.so
E/libc    ( 7233):      #03  pc 40096490  /system/bin/malloctest
E/libc    ( 7233):      #04  pc 00016f24  /system/lib/libc.so
E/libc    ( 7233): +++ ALLOCATION 0x404b9278 SIZE 10 NOW BEING FREED HERE:
E/libc    ( 7233): *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
E/libc    ( 7233):      #00  pc 0000c35a  /system/lib/libc_malloc_debug_leak.so
E/libc    ( 7233):      #01  pc 0000c6ac  /system/lib/libc_malloc_debug_leak.so
E/libc    ( 7233):      #02  pc 00016d94  /system/lib/libc.so
E/libc    ( 7233):      #03  pc 400964a0  /system/bin/malloctest
E/libc    ( 7233):      #04  pc 00016f24  /system/lib/libc.so

The following for a heap overrun and underrun:

E/libc    ( 7233): +++ REAR GUARD MISMATCH [10, 11)
E/libc    ( 7233): +++ ALLOCATION 0x404b9198 SIZE 10 HAS A CORRUPTED REAR GUARD
E/libc    ( 7233): +++ ALLOCATION 0x404b9198 SIZE 10 ALLOCATED HERE:
E/libc    ( 7233): *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
E/libc    ( 7233):      #00  pc 0000c35a  /system/lib/libc_malloc_debug_leak.so
E/libc    ( 7233):      #01  pc 0000c658  /system/lib/libc_malloc_debug_leak.so
E/libc    ( 7233):      #02  pc 00016d80  /system/lib/libc.so
E/libc    ( 7233):      #03  pc 40096438  /system/bin/malloctest
E/libc    ( 7233):      #04  pc 00016f24  /system/lib/libc.so
E/libc    ( 7233): +++ ALLOCATION 0x404b9198 SIZE 10 FREED HERE:
E/libc    ( 7233): *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
E/libc    ( 7233):      #00  pc 0000c35a  /system/lib/libc_malloc_debug_leak.so
E/libc    ( 7233):      #01  pc 0000c7d2  /system/lib/libc_malloc_debug_leak.so
E/libc    ( 7233):      #02  pc 00016d94  /system/lib/libc.so
E/libc    ( 7233):      #03  pc 40096462  /system/bin/malloctest
E/libc    ( 7233):      #04  pc 00016f24  /system/lib/libc.so
E/libc    ( 7233): +++ ALLOCATION 0x404b9358 SIZE 10 HAS A CORRUPTED FRONT GUARD
E/libc    ( 7233): +++ ALLOCATION 0x404b9358 SIZE 10 ALLOCATED HERE:
E/libc    ( 7233): *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
E/libc    ( 7233):      #00  pc 0000c35a  /system/lib/libc_malloc_debug_leak.so
E/libc    ( 7233):      #01  pc 0000c658  /system/lib/libc_malloc_debug_leak.so
E/libc    ( 7233):      #02  pc 00016d80  /system/lib/libc.so
E/libc    ( 7233):      #03  pc 400964ba  /system/bin/malloctest
E/libc    ( 7233):      #04  pc 00016f24  /system/lib/libc.so
E/libc    ( 7233): +++ ALLOCATION 0x404b9358 SIZE 10 FREED HERE:
E/libc    ( 7233): *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
E/libc    ( 7233):      #00  pc 0000c35a  /system/lib/libc_malloc_debug_leak.so
E/libc    ( 7233):      #01  pc 0000c7d2  /system/lib/libc_malloc_debug_leak.so
E/libc    ( 7233):      #02  pc 00016d94  /system/lib/libc.so
E/libc    ( 7233):      #03  pc 400964e4  /system/bin/malloctest
E/libc    ( 7233):      #04  pc 00016f24  /system/lib/libc.so

The following for a memory leak:

E/libc    ( 7233): +++ THERE ARE 1 LEAKED ALLOCATIONS
E/libc    ( 7233): +++ DELETING 4096 BYTES OF LEAKED MEMORY AT 0x404b95e8 (1 REMAINING)
E/libc    ( 7233): +++ ALLOCATION 0x404b95e8 SIZE 4096 ALLOCATED HERE:
E/libc    ( 7233): *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
E/libc    ( 7233):      #00  pc 0000c35a  /system/lib/libc_malloc_debug_leak.so
E/libc    ( 7233):      #01  pc 0000c658  /system/lib/libc_malloc_debug_leak.so
E/libc    ( 7233):      #02  pc 00016d80  /system/lib/libc.so
E/libc    ( 7233):      #03  pc 0001bc94  /system/lib/libc.so
E/libc    ( 7233):      #04  pc 0001edf6  /system/lib/libc.so
E/libc    ( 7233):      #05  pc 0001b80a  /system/lib/libc.so
E/libc    ( 7233):      #06  pc 0001c086  /system/lib/libc.so
E/libc    ( 7233):      #07  pc 40096402  /system/bin/malloctest
E/libc    ( 7233):      #08  pc 00016f24  /system/lib/libc.so

Change-Id: Ic440e9d05a01e2ea86b25e8998714e88bc2d16e0
Signed-off-by: Iliyan Malchev <malchev@google.com>
12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 31 May 2012 13:59:25 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev

12 years agobionic: introduce libc.debug.malloc.program
Iliyan Malchev [Tue, 29 May 2012 23:46:17 +0000 (16:46 -0700)]
bionic: introduce libc.debug.malloc.program

libc.debug.malloc.program  provides an additional level of control over which
processes to enable libc.debug.malloc functionality for.  The string value of
libc.debug.malloc.program is matched against the program name; if the value of
libc.debug.malloc.program is a substring of the program name, then malloc debug
is applied to that program at whatever level libc.debug.malloc specifies.

If lib.debug.malloc.program is not specified, then libc.debug.malloc has the
same effect as before.

For example, to enable libc.deubug.malloc = 10 only to the mediaserver, do the
following:

   adb root # necessary for setprop
   adb setprop libc.debug.malloc.program mediaserver
   adb setprop libc.debug.malloc 10
   adb kill -9 $(pid mediaserver)

Change-Id: I6f01c12f033c8e2e015d73025369d7f1685ba200
Signed-off-by: Iliyan Malchev <malchev@google.com>
12 years agoam 03539a36: Merge "Ensure that the port number and TXID are properly randomized...
Geremy Condra [Wed, 30 May 2012 18:09:05 +0000 (11:09 -0700)]
am 03539a36: Merge "Ensure that the port number and TXID are properly randomized." into jb-dev

* commit '03539a36b634bdfa61c06277cf25e0ca8e3105ba':
  Ensure that the port number and TXID are properly randomized.

12 years agoMerge "Ensure that the port number and TXID are properly randomized." into jb-dev
Geremy Condra [Wed, 30 May 2012 18:06:54 +0000 (11:06 -0700)]
Merge "Ensure that the port number and TXID are properly randomized." into jb-dev

12 years agoReconcile with jb-release
The Android Open Source Project [Tue, 29 May 2012 16:39:17 +0000 (09:39 -0700)]
Reconcile with jb-release

Change-Id: Id0b365ef6729dc36b88193f1675d3819e56bd426

12 years agoPrint the corrupted address passed to free().
Ben Cheng [Thu, 24 May 2012 23:56:53 +0000 (16:56 -0700)]
Print the corrupted address passed to free().

For example:

@@@ ABORTING: INVALID HEAP ADDRESS IN dlfree addr=0x5c3bfbd0
Fatal signal 11 (SIGSEGV) at 0xdeadbaad (code=1), thread 2942

The addr=0x5c3bfbd0 part is new.

Change-Id: I8670144b2b0a3a6182384150d762c97dfee5452f

12 years agoam c84ff11d: Print the corrupted address passed to free().
Ben Cheng [Fri, 25 May 2012 00:21:03 +0000 (17:21 -0700)]
am c84ff11d: Print the corrupted address passed to free().

* commit 'c84ff11dad26435dc5760bceda18e8f1175a6061':
  Print the corrupted address passed to free().

12 years agoPrint the corrupted address passed to free().
Ben Cheng [Thu, 24 May 2012 23:56:53 +0000 (16:56 -0700)]
Print the corrupted address passed to free().

For example:

@@@ ABORTING: INVALID HEAP ADDRESS IN dlfree addr=0x5c3bfbd0
Fatal signal 11 (SIGSEGV) at 0xdeadbaad (code=1), thread 2942

The addr=0x5c3bfbd0 part is new.

Change-Id: I8670144b2b0a3a6182384150d762c97dfee5452f

12 years agoEnsure that the port number and TXID are properly randomized.
Geremy Condra [Mon, 21 May 2012 21:20:59 +0000 (14:20 -0700)]
Ensure that the port number and TXID are properly randomized.

This fix reads from /dev/urandom to get the required entropy.

Bug: 6535492
Change-Id: Ibc2fec3f71a67607b608ad9b767b0b6504993c1d

12 years agoam c7882ab2: Merge "bionic: add clean kernel header ucontext.h"
Jean-Baptiste Queru [Thu, 17 May 2012 20:28:10 +0000 (13:28 -0700)]
am c7882ab2: Merge "bionic: add clean kernel header ucontext.h"

* commit 'c7882ab2a99a74c8f772ab03fdfd9a3b53515e46':
  bionic: add clean kernel header ucontext.h

12 years agoMerge "bionic: add clean kernel header ucontext.h"
Jean-Baptiste Queru [Thu, 17 May 2012 19:25:01 +0000 (12:25 -0700)]
Merge "bionic: add clean kernel header ucontext.h"

12 years agoam 70cf0bc0: Merge "Remove the last references to SuperH."
Elliott Hughes [Thu, 17 May 2012 00:18:23 +0000 (17:18 -0700)]
am 70cf0bc0: Merge "Remove the last references to SuperH."

* commit '70cf0bc0496a1d4c0e83fe3f1933f667ab66c148':
  Remove the last references to SuperH.

12 years agoMerge "Remove the last references to SuperH."
Elliott Hughes [Wed, 16 May 2012 16:56:37 +0000 (09:56 -0700)]
Merge "Remove the last references to SuperH."

12 years agoam cf8e554c: (-s ours) Merge "Make the linker relocatable."
Nick Kralevich [Wed, 16 May 2012 16:14:22 +0000 (09:14 -0700)]
am cf8e554c: (-s ours) Merge "Make the linker relocatable."

* commit 'cf8e554c72af1dd634d4f36a9065e34e853f8714':
  Make the linker relocatable.

12 years agoam 36e0345a: Merge "linker: set LOCAL_NO_CRT := true"
Nick Kralevich [Wed, 16 May 2012 16:11:52 +0000 (09:11 -0700)]
am 36e0345a: Merge "linker: set LOCAL_NO_CRT := true"

* commit '36e0345af89e2ed768ed38dcdf016a7640cf8ba5':
  linker: set LOCAL_NO_CRT := true

12 years agoam 1adc7c03: Merge "linker: Fix the computation of si->base"
Nick Kralevich [Wed, 16 May 2012 16:11:50 +0000 (09:11 -0700)]
am 1adc7c03: Merge "linker: Fix the computation of si->base"

* commit '1adc7c03898ee1f6a4c7f8cffa3c07507b9da5a9':
  linker: Fix the computation of si->base

12 years agoam cd6b2007: (-s ours) Merge "Add linker support for PIE"
Nick Kralevich [Wed, 16 May 2012 16:11:49 +0000 (09:11 -0700)]
am cd6b2007: (-s ours) Merge "Add linker support for PIE"

* commit 'cd6b2007b851f1cfa47d8bcc7ec859dfa7557382':
  Add linker support for PIE

12 years agoReconcile with jb-release nakasi-factoryrom-release
The Android Open Source Project [Wed, 16 May 2012 15:31:49 +0000 (08:31 -0700)]
Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I5a5b95da6c33afbc36893e162f3b57c09c161ee2

12 years agoRemove the last references to SuperH.
Elliott Hughes [Wed, 16 May 2012 00:03:18 +0000 (17:03 -0700)]
Remove the last references to SuperH.

Change-Id: Icb44c1f94cb178d90b4c2b1e8f6d175586aec4e1

12 years agoMerge "Make the linker relocatable."
Nick Kralevich [Tue, 15 May 2012 22:10:24 +0000 (15:10 -0700)]
Merge "Make the linker relocatable."

12 years agoMerge "linker: set LOCAL_NO_CRT := true"
Nick Kralevich [Tue, 15 May 2012 22:10:12 +0000 (15:10 -0700)]
Merge "linker: set LOCAL_NO_CRT := true"

12 years agoMerge "linker: Fix the computation of si->base"
Nick Kralevich [Tue, 15 May 2012 22:10:00 +0000 (15:10 -0700)]
Merge "linker: Fix the computation of si->base"

12 years agoMerge "Add linker support for PIE"
Nick Kralevich [Tue, 15 May 2012 22:09:45 +0000 (15:09 -0700)]
Merge "Add linker support for PIE"

12 years agoMake the linker relocatable.
Nick Kralevich [Fri, 11 Nov 2011 23:53:17 +0000 (15:53 -0800)]
Make the linker relocatable.

Previously, the linker always loaded itself into the same
location in memory, which inhibited the effectiveness of Android's
ASLR implementation. Modify the linker code so it can be relocatable
and link itself at runtime.

Change-Id: Ia80273d7a00ff648b4da545f4b69debee6343968

12 years agolinker: set LOCAL_NO_CRT := true
Nick Kralevich [Fri, 4 Nov 2011 17:11:26 +0000 (10:11 -0700)]
linker: set LOCAL_NO_CRT := true

Use LOCAL_NO_CRT to prevent linking against crtbegin.o, rather than
messing with build rules. This also prevents linking against crtend.o,
which isn't needed for the linker.

Change-Id: I0c5b9999be7e8676560fe145c1c033ffce8db4d1

12 years agolinker: Fix the computation of si->base
David 'Digit' Turner [Tue, 15 Nov 2011 16:17:28 +0000 (17:17 +0100)]
linker: Fix the computation of si->base

The computation of si->base assumed that the first entry in the
program header table is a PT_PHDR. This results in the dynamic
linker crashing with a SIGSEGV/MAPERR when trying to load some
of the NDK unit test programs, which happen to have an EXIDX
header first, followed byu a PHDR one.

This patch fixes the computation by parsing the program header
table, looking explicitely for the PHDR entry. This fixes the
load of the NDK unit test programs, and doesn't affect system
libraries.

Change-Id: Id18ea6037dbe950b5abbbce816c2960321f0b81d

12 years agoAdd linker support for PIE
Nick Kralevich [Thu, 20 Oct 2011 21:57:56 +0000 (14:57 -0700)]
Add linker support for PIE

Modify the dynamic linker so that executables can be loaded
at locations other than 0x00000000.

Modify crtbegin* so that non-PIC compilant "thumb interwork
veneers" are not created by the linker.

Bug: 5323301
Change-Id: Iece0272e2b708c79034f302c20160e1fe9029588

12 years agobionic: add clean kernel header ucontext.h
Kito Cheng [Sun, 13 May 2012 17:42:12 +0000 (01:42 +0800)]
bionic: add clean kernel header ucontext.h

Change-Id: I34fd0b0147fa33fd74c13480bc11827634233a41

12 years agoam 4f05d1c7: Merge "bionic/x86: Optimization for memcpy"
Elliott Hughes [Fri, 11 May 2012 04:31:48 +0000 (21:31 -0700)]
am 4f05d1c7: Merge "bionic/x86: Optimization for memcpy"

* commit '4f05d1c758ba141c617f25251a661ecb66627e9e':
  bionic/x86: Optimization for memcpy

12 years agoMerge "bionic/x86: Optimization for memcpy"
Elliott Hughes [Thu, 10 May 2012 17:14:43 +0000 (10:14 -0700)]
Merge "bionic/x86: Optimization for memcpy"

12 years agoresolved conflicts for merge of 08e72d01 to jb-dev-plus-aosp
Iliyan Malchev [Thu, 10 May 2012 16:19:59 +0000 (09:19 -0700)]
resolved conflicts for merge of 08e72d01 to jb-dev-plus-aosp

Change-Id: If00e354a5953ed54b31963d4f8ea77e1603c321e

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 10 May 2012 13:59:27 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoam edb7cad9: Merge "Actually set the header guard in "linux-syscalls.h"."
Elliott Hughes [Thu, 10 May 2012 03:10:14 +0000 (20:10 -0700)]
am edb7cad9: Merge "Actually set the header guard in "linux-syscalls.h"."

* commit 'edb7cad9b764f029c5faac2750f749d3d84bd86a':
  Actually set the header guard in "linux-syscalls.h".

12 years agoMerge "Actually set the header guard in "linux-syscalls.h"."
Elliott Hughes [Wed, 9 May 2012 23:39:40 +0000 (16:39 -0700)]
Merge "Actually set the header guard in "linux-syscalls.h"."

12 years agoActually set the header guard in "linux-syscalls.h".
Elliott Hughes [Wed, 9 May 2012 23:34:11 +0000 (16:34 -0700)]
Actually set the header guard in "linux-syscalls.h".

Spotted while merging a MIPS change.

Change-Id: I36fb5a07d0bba0c117e9fe9733957bd37ca4b4c0

12 years agoresolved conflicts for merge of e5408907 to jb-dev-plus-aosp
Elliott Hughes [Wed, 9 May 2012 20:53:37 +0000 (13:53 -0700)]
resolved conflicts for merge of e5408907 to jb-dev-plus-aosp

Change-Id: If4c3f51bf87b28da8074be2e46ae772a374b266f

12 years agobionic: add support for non-NEON memcpy() on NEON SoCs
Prajakta Gudadhe [Mon, 7 May 2012 21:17:44 +0000 (14:17 -0700)]
bionic: add support for non-NEON memcpy() on NEON SoCs

Some SoCs that support NEON nevertheless perform better with a non-NEON than a
NEON memcpy().  This patch adds build variable ARCH_ARM_USE_NON_NEON_MEMCPY,
which can be set in BoardConfig.mk.  When ARCH_ARM_USE_NON_NEON_MEMCPY is
defined, we compile in the non-NEON optimized memcpy() even if the SoC supports
NEON.

Change-Id: Ia0e5bee6bad5880ffc5ff8f34a1382d567546cf9

12 years agoam 7eb1cc23: Merge "bionic: allow the board to customize MALLOC_ALIGNMENT"
Elliott Hughes [Wed, 9 May 2012 19:53:16 +0000 (12:53 -0700)]
am 7eb1cc23: Merge "bionic: allow the board to customize MALLOC_ALIGNMENT"

* commit '7eb1cc23f8976a2062ba0cf92f030216a8e64e60':
  bionic: allow the board to customize MALLOC_ALIGNMENT

12 years agoam fd955033: Merge "pthread: Invalidate stale stack pointers on pthread_exit()"
Elliott Hughes [Wed, 9 May 2012 19:53:16 +0000 (12:53 -0700)]
am fd955033: Merge "pthread: Invalidate stale stack pointers on pthread_exit()"

* commit 'fd95503347acba5c52d669a186ad2b161338a8a7':
  pthread: Invalidate stale stack pointers on pthread_exit()

12 years agoMerge "[MIPS] Add support for MIPS syscalls"
Elliott Hughes [Wed, 9 May 2012 18:50:06 +0000 (11:50 -0700)]
Merge "[MIPS] Add support for MIPS syscalls"

12 years ago[MIPS] Add support for MIPS syscalls
Raghu Gandham [Sat, 28 Jan 2012 01:51:42 +0000 (17:51 -0800)]
[MIPS] Add support for MIPS syscalls

Change-Id: I4deba67e15c865c4c2db03064c04098a09828ea6
Signed-off-by: Raghu Gandham <raghu@mips.com>
Signed-off-by: Chris Dearman <chris@mips.com>
12 years agoMerge "bionic: allow the board to customize MALLOC_ALIGNMENT"
Elliott Hughes [Wed, 9 May 2012 16:52:56 +0000 (09:52 -0700)]
Merge "bionic: allow the board to customize MALLOC_ALIGNMENT"

12 years agobionic: allow the board to customize MALLOC_ALIGNMENT
Jack Ren [Sat, 19 Nov 2011 01:48:03 +0000 (09:48 +0800)]
bionic: allow the board to customize MALLOC_ALIGNMENT

Currently the dlmalloc allocates the memory with 8-byte alignment.
According to the com.aurorasoftworks.quadrant.ui.professional benchmark data:
We can get much better memory performance if we change it to be 16-byte aligned.
For example, On Nexus-S:
8-byte aligned :
    1378 1070  1142 1665 1765  1163 1179  1263  1404 avg: 1336.555555556
16-byte aligned:
    1691 1731  1780 1691 1671  1678 1802  1758  1780 avg: 1731.333333333
                                                    gain: 29.53%

That patch provides flexibity to customize the MALLOC_ALIGNMENT from the
board config.The macro MALLOC_ALIGNMENT defaults to 8.
To change it, please define BOARD_MALLOC_ALIGNMENT in the BoardConfig.mk:
BOARD_MALLOC_ALIGNMENT := <whatever>

Change-Id: I8da0376944a0bbcef1d0fc026bfb6d9125db9739
Signed-off-by: Jin Wei <wei.a.jin@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Signed-off-by: Beare, Bruce J <bruce.j.beare@intel.com>
12 years agoMerge "pthread: Invalidate stale stack pointers on pthread_exit()"
Elliott Hughes [Wed, 9 May 2012 16:46:02 +0000 (09:46 -0700)]
Merge "pthread: Invalidate stale stack pointers on pthread_exit()"

12 years agoresolved conflicts for merge of 3919b96e to jb-dev-plus-aosp
Elliott Hughes [Wed, 9 May 2012 16:38:40 +0000 (09:38 -0700)]
resolved conflicts for merge of 3919b96e to jb-dev-plus-aosp

Change-Id: I80571b5f024a4e1abe2606d10e07006f53bbc01f

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 9 May 2012 14:46:07 +0000 (07:46 -0700)]
merge in jb-release history after reset to jb-dev

12 years agoam 08b51e2c: Implement the "abort" stub in assembly for ARM.
Ben Cheng [Wed, 9 May 2012 08:48:40 +0000 (01:48 -0700)]
am 08b51e2c: Implement the "abort" stub in assembly for ARM.

* commit '08b51e2c091d036c124259ae59eb7be6bbe346af':
  Implement the "abort" stub in assembly for ARM.

12 years agoam 20bea000: Merge "Cherry-pick "generate PIC code"."
Elliott Hughes [Wed, 9 May 2012 02:57:58 +0000 (19:57 -0700)]
am 20bea000: Merge "Cherry-pick "generate PIC code"."

* commit '20bea00090e530f2e6f4d97de4b7cf8031b86a86':
  Cherry-pick "generate PIC code".

12 years agopthread: Invalidate stale stack pointers on pthread_exit()
Bjorn Andersson [Fri, 4 May 2012 00:12:39 +0000 (17:12 -0700)]
pthread: Invalidate stale stack pointers on pthread_exit()

A call to pthread_key_delete() after pthread_exit() have unmapped the stack of a thread
but before the ongoing pthread_join() have finished executing will result in an access
to unmapped memory.
Avoid this by invalidating the stack_base and tls pointers during pthread_exit().

This is based on the investigation and proprosed solution by
Srinavasa Nagaraju <srinavasa.x.nagaraju@sonyericsson.com>

Change-Id: I145fb5d57930e91b00f1609d7b2cd16a55d5b3a9

12 years agoMerge "Implement the "abort" stub in assembly for ARM."
Elliott Hughes [Tue, 8 May 2012 21:54:56 +0000 (14:54 -0700)]
Merge "Implement the "abort" stub in assembly for ARM."

12 years agoImplement the "abort" stub in assembly for ARM.
Ben Cheng [Tue, 8 May 2012 20:36:37 +0000 (13:36 -0700)]
Implement the "abort" stub in assembly for ARM.

So that we can always get the full stack trace regardless of gcc's handling
of the "noreturn" attribute associated with abort().

(Cherry pick of Id264a5167e7cabbf11515fbc48f5469c527e34d4.)

Bug: 6455193

Conflicts:

libc/Android.mk

Change-Id: I568fc5303fd1d747075ca933355f914122f94dac

12 years agoImplement the "abort" stub in assembly for ARM.
Ben Cheng [Tue, 8 May 2012 20:36:37 +0000 (13:36 -0700)]
Implement the "abort" stub in assembly for ARM.

So that we can always get the full stack trace regardless of gcc's handling
of the "noreturn" attribute associated with abort().

[cherry-picked from master]

BUG:6455193
Change-Id: I0102355f5bf20e636d3feab9d1424495f38e39e2

12 years agoresolved conflicts for merge of 6cf3c7c5 to jb-dev-plus-aosp
Elliott Hughes [Tue, 8 May 2012 20:26:28 +0000 (13:26 -0700)]
resolved conflicts for merge of 6cf3c7c5 to jb-dev-plus-aosp

Change-Id: Ib22a8ae1ef63bf9b9c82ce6e22afd188ba7c2806

12 years agobionic/x86: Optimization for memcpy
Jack Ren [Tue, 14 Feb 2012 08:01:52 +0000 (12:01 +0400)]
bionic/x86: Optimization for memcpy

Signed-off-by: Liubov Dmitrieva <liubov.dmitrieva@intel.com>
Signed-off-by: H.J. Lu <hongjiu.lu@intel.com>
Signed-off-by: Wei A Jin <wei.a.jin@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Conflicts:

libc/arch-x86/string/ssse3-memcpy5.S

Change-Id: I41e70d1d19d5457e65c89b64da452fbdaf3a00a7

12 years agoMerge "Cherry-pick "generate PIC code"."
Elliott Hughes [Tue, 8 May 2012 18:56:13 +0000 (11:56 -0700)]
Merge "Cherry-pick "generate PIC code"."

12 years agoCherry-pick "generate PIC code".
Nick Kralevich [Fri, 11 Nov 2011 23:47:24 +0000 (15:47 -0800)]
Cherry-pick "generate PIC code".

Change-Id: I7d5f2e5663df263493f65e364c959e663fc4d13a

12 years agoMerge "Let pthread_create fail if schedparam can't be set"
Elliott Hughes [Tue, 8 May 2012 17:56:00 +0000 (10:56 -0700)]
Merge "Let pthread_create fail if schedparam can't be set"

12 years agoLet pthread_create fail if schedparam can't be set
Pierre Peiffer [Wed, 22 Feb 2012 15:40:15 +0000 (16:40 +0100)]
Let pthread_create fail if schedparam can't be set

The creation of a thread succeeds even if the requested scheduling
parameters can not be set. This is not POSIX compliant, and even
worse, it leads to a wrong behavior. Let pthread_create() fail in this
case.

Change-Id: Ice66e2a720975c6bde9fe86c2cf8f649533a169c
Signed-off-by: Christian Bejram <christian.bejram@stericsson.com>
12 years agoAvoid multiple dns lookups for the same query
Mattias Falk [Tue, 6 Sep 2011 13:15:06 +0000 (15:15 +0200)]
Avoid multiple dns lookups for the same query

If two or more rapid dns requests for the same server are done
from different threads it turns into separate dns reques, if
the response of the request isn't found in the cache.

This patch avoid multiple request for the same server by
letting subsequents request wait until the first request
has finished.

Change-Id: Ic72ea0e7d3964a4164eddf866feb4357ec4dfe54

12 years agoam e3bc7192: Merge "bionic: fix integer overflows in chk_malloc(), leak_malloc()...
Elliott Hughes [Mon, 7 May 2012 21:00:01 +0000 (14:00 -0700)]
am e3bc7192: Merge "bionic: fix integer overflows in chk_malloc(), leak_malloc(), and leak_memalign()"

* commit 'e3bc7192ec4254bed00eb8b352735665c6072995':
  bionic: fix integer overflows in chk_malloc(), leak_malloc(), and leak_memalign()

12 years agoam 73a6566d: Merge "Remove expired dns cache entries before removing oldest"
Elliott Hughes [Mon, 7 May 2012 20:59:59 +0000 (13:59 -0700)]
am 73a6566d: Merge "Remove expired dns cache entries before removing oldest"

* commit '73a6566da337db50cfc73c369d774ac1905a30c2':
  Remove expired dns cache entries before removing oldest

12 years agoam 8657eafc: Merge "Adjust memcpy for ARM Cortex A9 cache line size"
Elliott Hughes [Mon, 7 May 2012 20:59:58 +0000 (13:59 -0700)]
am 8657eafc: Merge "Adjust memcpy for ARM Cortex A9 cache line size"

* commit '8657eafc3552f36c176667c1591beab255308da6':
  Adjust memcpy for ARM Cortex A9 cache line size

12 years agoMerge "bionic: fix integer overflows in chk_malloc(), leak_malloc(), and leak_memalign()"
Elliott Hughes [Mon, 7 May 2012 17:51:28 +0000 (10:51 -0700)]
Merge "bionic: fix integer overflows in chk_malloc(), leak_malloc(), and leak_memalign()"

12 years agobionic: fix integer overflows in chk_malloc(), leak_malloc(), and leak_memalign()
Xi Wang [Wed, 14 Mar 2012 06:48:39 +0000 (02:48 -0400)]
bionic: fix integer overflows in chk_malloc(), leak_malloc(), and leak_memalign()

The allocation size in chk_malloc(), leak_malloc(), and leak_memalign()
functions may be rounded up to a small value, leading to buffer overflows.
The code only runs in debugging mode.

This patch complements commit 6f04a0f4 (CVE-2009-0607).

Change-Id: Id899bcd2bcd2ea2205e5753c433390710032dc83
Signed-off-by: Xi Wang <xi.wang@gmail.com>
12 years agoMerge "Remove expired dns cache entries before removing oldest"
Elliott Hughes [Mon, 7 May 2012 17:41:52 +0000 (10:41 -0700)]
Merge "Remove expired dns cache entries before removing oldest"

12 years agoMerge "Adjust memcpy for ARM Cortex A9 cache line size"
Elliott Hughes [Mon, 7 May 2012 16:13:34 +0000 (09:13 -0700)]
Merge "Adjust memcpy for ARM Cortex A9 cache line size"

12 years agoAdjust memcpy for ARM Cortex A9 cache line size
Henrik Smiding [Wed, 15 Sep 2010 14:08:03 +0000 (16:08 +0200)]
Adjust memcpy for ARM Cortex A9 cache line size

ARM Cortex A8 use 64 bytes and ARM Cortex A9 use 32 bytes cache line
size.

The following patch:
  Adds code to adjust memcpy cache line size to match A9 cache line
  size.
  Adds a flag to select between 32 bytes and 64 bytes cache line
  size.

  Copyright (C) ST-Ericsson SA 2010
    Modified neon implementation to fit Cortex A9 cache line size
    Author: Henrik Smiding henrik.smiding@stericsson.com for
            ST-Ericsson.

Change-Id: I8a55946bfb074e6ec0a14805ed65f73fcd0984a3
Signed-off-by: Christian Bejram <christian.bejram@stericsson.com>
12 years agoam f7db5ecc: Merge "MIPS support to libm, libdl and libthread_db"
Elliott Hughes [Sat, 5 May 2012 01:07:11 +0000 (18:07 -0700)]
am f7db5ecc: Merge "MIPS support to libm, libdl and libthread_db"

* commit 'f7db5ecc4d662da8368f31d57401ca1a39690e40':
  MIPS support to libm, libdl and libthread_db

12 years agoMerge "MIPS support to libm, libdl and libthread_db"
Elliott Hughes [Fri, 4 May 2012 19:00:19 +0000 (12:00 -0700)]
Merge "MIPS support to libm, libdl and libthread_db"

12 years agoMIPS support to libm, libdl and libthread_db
Chris Dearman [Wed, 2 May 2012 00:45:53 +0000 (17:45 -0700)]
MIPS support to libm, libdl and libthread_db

Change-Id: I9106721af7fe0cd45df82976250db0d300a20117
Signed-off-by: Raghu Gandham <raghu@mips.com>
12 years agoam 10579fc4: Merge "Update s_fabsl.c to upstream head."
Elliott Hughes [Tue, 1 May 2012 11:56:57 +0000 (04:56 -0700)]
am 10579fc4: Merge "Update s_fabsl.c to upstream head."

* commit '10579fc43d3ade285eed7318aee062a999f2784d':
  Update s_fabsl.c to upstream head.

12 years agoMerge "Update s_fabsl.c to upstream head."
Elliott Hughes [Tue, 1 May 2012 05:35:02 +0000 (22:35 -0700)]
Merge "Update s_fabsl.c to upstream head."

12 years agoUpdate s_fabsl.c to upstream head.
Elliott Hughes [Mon, 30 Apr 2012 23:12:43 +0000 (16:12 -0700)]
Update s_fabsl.c to upstream head.

Bug: http://code.google.com/p/android/issues/detail?id=29539
Change-Id: I843dcfcbfe49e8e9f43c49aae6ade1edb57a3053

12 years agomerge in jb-release history after reset to jb-dev
The Android Automerger [Mon, 30 Apr 2012 13:59:25 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev