OSDN Git Service
Nick Kralevich [Mon, 9 Apr 2012 20:41:14 +0000 (13:41 -0700)]
Merge "linker: remove STB_LOCAL hack"
Nick Kralevich [Mon, 9 Apr 2012 19:50:17 +0000 (12:50 -0700)]
linker: remove STB_LOCAL hack
The ARM static linker wasn't properly handling __exidx_start
and __exidx_end symbols. Now that the static linker has been fixed,
we don't need the dynamic linker to work around this problem.
Change-Id: Ic567122b6c7746cc016795e2befba2c6bd7c0478
Jeff Brown [Mon, 9 Apr 2012 18:24:27 +0000 (11:24 -0700)]
Merge "Update linux/input.h to version 3.4."
Jeff Brown [Sat, 7 Apr 2012 02:24:35 +0000 (19:24 -0700)]
Update linux/input.h to version 3.4.
Bug:
6292993
Change-Id: Ic7628068df6c8de9cb3711a4540d51365b96ebdb
Dima Zavin [Mon, 2 Apr 2012 19:57:03 +0000 (12:57 -0700)]
libc/kernel: update cleaned v4l2 header
Change-Id: Ib3747b45eb1e4095cca3de6d7692387953e8c4a7
Signed-off-by: Dima Zavin <dima@android.com>
JP Abgrall [Fri, 6 Apr 2012 03:36:36 +0000 (20:36 -0700)]
Merge "libc/kernel-headers: Auto generated files for netfilter/xt_IDLETIMER"
Ashish Sharma [Fri, 6 Apr 2012 02:50:42 +0000 (19:50 -0700)]
libc/kernel-headers: Auto generated files for netfilter/xt_IDLETIMER
From Change I526b5fce: Add NETLINK_IDLETIMER msg type and include the corresponding header file.
Change-Id: I24bffc11394c8664e4d7d7f439b0600545f07536
Signed-off-by: Ashish Sharma <ashishsharma@google.com>
Nick Kralevich [Wed, 4 Apr 2012 19:43:32 +0000 (12:43 -0700)]
linker: surround "debug_verbosity" by "#if LINKER_DEBUG"
Avoid executing useless code when we're not compiled
with debugging support.
Change-Id: Iea1821b241acacdf65d1a91d743356058dfef273
Nick Kralevich [Wed, 4 Apr 2012 17:18:27 +0000 (10:18 -0700)]
linker: enable -fvisibility=hidden
Compile the linker with -fvisibility=hidden. This reduces the number
of symbols that show up in the .dynsym section of the linker.
These symbols are never exported to other applications.
In particular, this fixes a problem with setting -DLINKER_DEBUG=1
introduced in
468319ce4f3f7383d788b76c09cda2a405311f36.
Because the symbols "debug_verbosity" and "format_log" have not been
resolved before the linker links itself, any attempt to call
PRINT / INFO / TRACE / WARN / ERROR will result in a segfault.
This change allows the static linker to produce a relative reference
to these symbols rather than relying on relocation.
This also has a nice side effect of making the linker slightly smaller
and slightly more optimized.
The following symbols no longer in the .dynsym section of the linker
after this change:
-addr_to_name
-call_constructors_recursi
-calloc
-debugger_init
-debugger_signal_handler
-debug_verbosity
-dladdr
-dlclose
-dlerror
-dl_lock
-dlopen
-dlsym
-dl_unwind_find_exidx
-find_containing_library
-find_containing_symbol
-find_library
-format_buffer
-free
-libdl_info
-linker_env_get
-linker_env_init
-linker_env_secure
-linker_env_unset
-linker_get_error
-__linker_init
-lookup
-lookup_in_library
-malloc
-notify_gdb_of_libraries
-notify_gdb_of_load
-notify_gdb_of_unload
-realloc
-rtld_db_dlactivity
-unload_library
-vsnprintf
Bug:
5827809
Change-Id: I5e8cd7dcf48c1d6831a970a67f63f24916c5e437
Mike Lockwood [Tue, 3 Apr 2012 18:35:33 +0000 (11:35 -0700)]
Merge remote-tracking branch 'goog/ics-aah'
Elliott Hughes [Mon, 2 Apr 2012 23:09:36 +0000 (16:09 -0700)]
am
fdb11929: am
b88f810d: Merge "Update to tzdata2012c."
* commit '
fdb119297ac421e2fc2ec096a6d5370b81938de8':
Update to tzdata2012c.
Elliott Hughes [Mon, 2 Apr 2012 23:07:46 +0000 (16:07 -0700)]
am
b88f810d: Merge "Update to tzdata2012c."
* commit '
b88f810d585a1736a1759c2c22e9f4999441ae00':
Update to tzdata2012c.
Elliott Hughes [Mon, 2 Apr 2012 17:25:43 +0000 (10:25 -0700)]
Merge "Update to tzdata2012c."
Elliott Hughes [Mon, 2 Apr 2012 14:35:13 +0000 (07:35 -0700)]
Update to tzdata2012c.
From the release notes:
africa
Summer time changes for Morocco (to start late April 2012)
asia
Changes for 2012 for Gaza & the West Bank (Hebron) and Syria
northamerica
Haiti following US/Canada rules for 2012 (and we're assuming,
for now anyway, for the future).
Also include a change made internally to the 'generate' script as part of
the tzdata2011m update that apparently never made it to AOSP; the original
checkin comment for which was:
Update to tzdata2011m.
Fixes for Europe/Tiraspol (Moldova) and all four Ukrainian zones.
Also show the MD5 of the downloaded data, for comparison against the MD5
given in the announcement mails. (There's a plan to move to proper signing,
but that's not implemented on their end yet.)
(I'm repeating the tzdata change for the convenience of anyone grepping the
log, since the 2012 tzdata releases also contain the 2011m changes; 2011m
is the only missing release I noticed.)
Change-Id: I9a2e530b3a8ea88e3375334a12376e3d8526f267
Elliott Hughes [Sat, 31 Mar 2012 05:16:02 +0000 (22:16 -0700)]
am
cd834618: am
63b14755: Merge "libc/x86: ensure the stack 16-byte aligned when tasks created"
* commit '
cd834618c4752b61d54ff4005a8baa8219b822e4':
libc/x86: ensure the stack 16-byte aligned when tasks created
Elliott Hughes [Fri, 30 Mar 2012 22:53:19 +0000 (15:53 -0700)]
am
63b14755: Merge "libc/x86: ensure the stack 16-byte aligned when tasks created"
* commit '
63b14755512d515762cbe3ad8544c561a576f32e':
libc/x86: ensure the stack 16-byte aligned when tasks created
Elliott Hughes [Fri, 30 Mar 2012 20:42:42 +0000 (13:42 -0700)]
Merge "libc/x86: ensure the stack 16-byte aligned when tasks created"
Dima Zavin [Fri, 30 Mar 2012 17:21:16 +0000 (10:21 -0700)]
Revert "libc/kernel: Add rules to autogenerate device specific kernel headers"
This reverts commit
884147c7d0b1b6571256feb11e12d893432625b2.
Change-Id: I09723858ac961f3e1155791aa5c54d5d3abfbd36
Signed-off-by: Dima Zavin <dima@android.com>
Elliott Hughes [Wed, 28 Mar 2012 00:58:57 +0000 (17:58 -0700)]
am
ea76f414: am
d509f9cc: am
09ce7749: Merge "[MIPS] Clean Kernel headers are generated by running libc/kernel/tools/update_all.py script. This patch ignores any changes to libc/kernel directory not related to MIPS architecture."
* commit '
ea76f4147825cc39d9aa91230cd863ed29f28e27':
[MIPS] Clean Kernel headers are generated by running libc/kernel/tools/update_all.py script. This patch ignores any changes to libc/kernel directory not related to MIPS architecture.
Elliott Hughes [Wed, 28 Mar 2012 00:57:41 +0000 (17:57 -0700)]
am
d509f9cc: am
09ce7749: Merge "[MIPS] Clean Kernel headers are generated by running libc/kernel/tools/update_all.py script. This patch ignores any changes to libc/kernel directory not related to MIPS architecture."
* commit '
d509f9ccbba6e1dd53acfd7425bfc06d6b3f8693':
[MIPS] Clean Kernel headers are generated by running libc/kernel/tools/update_all.py script. This patch ignores any changes to libc/kernel directory not related to MIPS architecture.
Elliott Hughes [Wed, 28 Mar 2012 00:53:35 +0000 (17:53 -0700)]
am
09ce7749: Merge "[MIPS] Clean Kernel headers are generated by running libc/kernel/tools/update_all.py script. This patch ignores any changes to libc/kernel directory not related to MIPS architecture."
* commit '
09ce7749d74733b28d4fa7a1d36457cb366cc5da':
[MIPS] Clean Kernel headers are generated by running libc/kernel/tools/update_all.py script. This patch ignores any changes to libc/kernel directory not related to MIPS architecture.
Elliott Hughes [Tue, 27 Mar 2012 23:49:28 +0000 (16:49 -0700)]
Merge "[MIPS] Clean Kernel headers are generated by running libc/kernel/tools/update_all.py script. This patch ignores any changes to libc/kernel directory not related to MIPS architecture."
Raghu Gandham [Tue, 27 Mar 2012 18:37:17 +0000 (11:37 -0700)]
[MIPS] Clean Kernel headers are generated by running
libc/kernel/tools/update_all.py script. This patch ignores
any changes to libc/kernel directory not related to MIPS
architecture.
Change-Id: I2c9e461dccb7c33eb4420be2db1a562f45137c8d
Signed-off-by: Raghu Gandham <raghu@mips.com>
Signed-off-by: Chris Dearman <chris@mips.com>
Jean-Baptiste Queru [Tue, 27 Mar 2012 17:10:50 +0000 (10:10 -0700)]
am
b52c941e: am
d7c6147e: am
56731351: Merge "bionic: fix atfork hanlder_mutex deadlock"
* commit '
b52c941ed4f24134b78a73daee84bdc328f969da':
bionic: fix atfork hanlder_mutex deadlock
Jean-Baptiste Queru [Tue, 27 Mar 2012 01:29:23 +0000 (18:29 -0700)]
am
d7c6147e: am
56731351: Merge "bionic: fix atfork hanlder_mutex deadlock"
* commit '
d7c6147eff65572762d55950b965db949ccd0281':
bionic: fix atfork hanlder_mutex deadlock
Jean-Baptiste Queru [Tue, 27 Mar 2012 01:25:43 +0000 (18:25 -0700)]
am
56731351: Merge "bionic: fix atfork hanlder_mutex deadlock"
* commit '
56731351de7230180fc99a1a4b0afd12f881b0f7':
bionic: fix atfork hanlder_mutex deadlock
Benoit Goby [Tue, 27 Mar 2012 00:14:24 +0000 (17:14 -0700)]
Merge "Add auto-generated headers for USB FunctionFS"
Jean-Baptiste Queru [Mon, 26 Mar 2012 23:19:35 +0000 (16:19 -0700)]
Merge "bionic: fix atfork hanlder_mutex deadlock"
Jean-Baptiste Queru [Mon, 26 Mar 2012 22:25:19 +0000 (15:25 -0700)]
Handle pthread-related changes (mutex/atfork)
First commit:
Revert "Revert "am
be741d47: am
2f460fbe: am
73b5cad9: Merge "bionic: Fix wrong kernel_id in pthread descriptor after fork()"""
This reverts commit
06823da2f0c8b4a4ce4c45113032f03df85c94b8.
Second commit:
bionic: fix atfork hanlder_mutex deadlock
This cherry-picks commit
34e89c232dd5645fe3b5f9b40856d8e3e4cae57a
After applying the kernel_id fix, the system refused to boot up and we
got following crash log:
I/DEBUG ( 113): pid: 618, tid: 618 >>> org.simalliance.openmobileapi.service:remote <<<
I/DEBUG ( 113): signal 16 (SIGSTKFLT), code -6 (?), fault addr --------
I/DEBUG ( 113): eax
fffffe00 ebx
b77de994 ecx
00000080 edx
00724002
I/DEBUG ( 113): esi
00000000 edi
00004000
I/DEBUG ( 113): xcs
00000073 xds
0000007b xes
0000007b xfs
00000000 xss
0000007b
I/DEBUG ( 113): eip
b7761351 ebp
bfdf3de8 esp
bfdf3dc4 flags
00000202
I/DEBUG ( 113): #00 eip:
00015351 /system/lib/libc.so
I/DEBUG ( 113): #01 eip:
0000d13c /system/lib/libc.so (pthread_mutex_lock)
I/DEBUG ( 113): #02 eip:
00077b48 /system/lib/libc.so (__bionic_atfork_run_prepare)
I/DEBUG ( 113): #03 eip:
00052cdb /system/lib/libc.so (fork)
I/DEBUG ( 113): #04 eip:
0009ae91 /system/lib/libdvm.so (_Z18dvmOptimizeDexFileillPKcjjb)
I/DEBUG ( 113): #05 eip:
000819d6 /system/lib/libdvm.so (_Z14dvmJarFileOpenPKcS0_PP7JarFileb)
I/DEBUG ( 113): #06 eip:
000b175e /system/lib/libdvm.so (_ZL40Dalvik_dalvik_system_DexFile_openDexFilePKjP6JValue)
I/DEBUG ( 113): #07 eip:
0011fb94 /system/lib/libdvm.so
Root cause:
The atfork uses the mutex handler_mutex to protect the atfork_head. The
parent will call __bionic_atfork_run_prepare() to lock the handler_mutex,
and need both the parent and child to unlock their own copy of handler_mutex
after fork. At that time, the owner of hanlder_mutex is set as the parent.
If we apply the kernel_id fix, then the child's kernel_id will be set as
child's tid.
The handler_mutex is a recursive lock, and pthread_mutex_unlock(&hander_mutex)
will fail because the mutex owner is the parent, while the current tid
(__get_thread()->kernel_id) is child, not matched with the mutex owner.
At that time, the handler_mutex is left in lock state.If the child wants to
fork other process after than, then it will try to lock handler_mutex, and
then be deadlocked.
Fix:
Since the child has its own copy of vm space from the the parent, the
child space's handler_mutex should be reset to the initialized state.
Change-Id: I3907dd9a153418fb78862f2aa6d0302c375d9e27
Signed-off-by: Jack Ren <jack.ren@intel.com>
Signed-off-by: Chenyang Du <chenyang.du@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Change-Id: Ic8072f366a877443a60fe215f3c00b3df5a259c8
Benoit Goby [Tue, 6 Mar 2012 00:10:41 +0000 (16:10 -0800)]
Add auto-generated headers for USB FunctionFS
linux/usb/ch9.h and linux/usb/functionfs.h
Change-Id: I2907081aba63b32740eb9916315759692a96ab42
Andrew Hsieh [Fri, 23 Mar 2012 15:07:36 +0000 (23:07 +0800)]
Fixed to #include correct 32-bit headers; Refreshed libc/kernel headers
This patch fixes an issue where 64-bit hreaders are incorrectly included
in kernel headers. For example, file "libc/kernel/arch-x86/asm/io.h"
incorreclty includes "io_64.h" (missing, BTW) instead of "io_32.h".
The reason is because CONFIG_X86_32 isn't considered pre-defined in
"kernel_default_arch_macros" for x86, and clean_header.py doesn't
look at it at all anyway (ie. __i386__ is also ignored, but it's
okay since x86 cross compiler defines it back)
Fixed 2 tools/*py, README.TXT, and refreshed libc/kernel headers
Change-Id: Iac834cc8b3548f055d3f2a214af36072dd679fe8
Jack Ren [Wed, 21 Mar 2012 09:48:13 +0000 (17:48 +0800)]
libc/x86: ensure the stack 16-byte aligned when tasks created
Currently Renderscript sample code RsBalls crashed on x86 when SSE2
enabled. The root cause is that the stack was not 16-byte aligned
from the beginning when the processes/threads were created, so the
RsBalls crashed when SSE2 instructions tried to access the variables
on the stack.
- For the thread created by fork():
Its stack alignment is determined by crtbegin_{dynamic, static}.S
- For the thread created by pthread_create():
Its stack alignment is determined by clone.S. __thread_entry( ) is
a standard C function. In order to have its stack be aligned with
16 byte properly, __thread_entry() needs the stack with following
layout when it is called:
layout #1 (correct)
--------------
| |
-------------- <--ESP (ECX - 20)
| ret EIP |
-------------- <--ECX - 16
| arg0 |
-------------- <--ECX - 12
| arg1 |
-------------- <--ECX - 8
| arg2 |
-------------- <--ECX - 4
| unused |
-------------- <--ECX (16-byte boundary)
But it has following layout for now:
layout #2: (incorrect)
--------------
| |
-------------- <--ESP (ECX - 16)
| unused |
-------------- <--ECX - 12
| arg0 |
-------------- <--ECX - 8
| arg1 |
-------------- <--ECX - 4
| arg2 |
-------------- <--ECX (16-byte boundary)
Fixed in this patch.
Change-Id: Ibe01f64db14be14033c505d854c73033556ddaa8
Signed-off-by: Michael Liao <michael.liao@intel.com>
Signed-off-by: H.J. Lu <hongjiu.lu@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Ben Cheng [Wed, 21 Mar 2012 22:47:12 +0000 (15:47 -0700)]
Initialize mspace->least_addr properly in the mmap path.
BUG:
6206963
Change-Id: Id2ab580246de50a4511b56a734a7bece98fb945c
Nick Kralevich [Wed, 21 Mar 2012 21:40:41 +0000 (14:40 -0700)]
Merge "string.h: add __attribute__ ((pure)) to string functions"
Iliyan Malchev [Wed, 21 Mar 2012 20:51:42 +0000 (13:51 -0700)]
Merge "bionic: pass MADV_MERGEABLE on private & anonymous mmaps"
JP Abgrall [Wed, 21 Mar 2012 20:43:10 +0000 (13:43 -0700)]
Merge "Update the libc kernel includes to support the newer mman for KSM support"
JP Abgrall [Wed, 21 Mar 2012 20:19:51 +0000 (13:19 -0700)]
bionic: pass MADV_MERGEABLE on private & anonymous mmaps
Change-Id: I8bc167bb33dec6417fe772172697ea6ff97da2f6
Signed-off-by: Iliyan Malchev <malchev@google.com>
JP Abgrall [Wed, 21 Mar 2012 20:21:08 +0000 (13:21 -0700)]
Update the libc kernel includes to support the newer mman for KSM support
These are generated from the matching external/kernel-headers/original
files (from kernel/samsung android-samsung-3.0-wip).
Change-Id: I982ff6a0d522ea250c3a437f5756766fcc6c5c91
Nick Kralevich [Wed, 21 Mar 2012 17:07:55 +0000 (10:07 -0700)]
Merge "fnmatch.c: Update to version in OpenBSD HEAD"
Nick Kralevich [Wed, 21 Mar 2012 16:46:46 +0000 (09:46 -0700)]
fnmatch.c: Update to version in OpenBSD HEAD
Upgrade fnmatch.c from OpenBSD version 1.13 to 1.16.
This is needed primarily to address CVE-2011-0419.
This is a straight copy from upstream's version at
http://www.openbsd.org/cgi-bin/cvsweb/src/lib/libc/gen/fnmatch.c and
incorporates the following changes:
Revision 1.16:
New fnmatch(3) implementation which is not recursive.
Written and provided under BSD licence by William A. Rowe Jr.
Originally released in Apache APR-1.4.5.
Merged class matching code from r1.14 and PATH_MAX check from r1.15.
ok miod millert
Revision 1.15:
Put a limit on recursion during matching, and reject input of size greater
or equal PATH_MAX. Based on similar fix made in NetBSD.
ok miod@ millert@
Revision 1.14:
POSIX character class support for fnmatch(3) and glob(3). OK deraadt@
Version 1.14 introduced charclasses.h, which we copy unmodified
from upstream version 1.1.
http://www.openbsd.org/cgi-bin/cvsweb/src/lib/libc/gen/charclass.h
Bug:
3435120
Change-Id: I45133468f0c3d439fd10eb087a1c647799f9d25b
Ben Cheng [Wed, 21 Mar 2012 16:32:24 +0000 (09:32 -0700)]
Merge "New additions/bug fixes required/found when porting perf."
Nick Kralevich [Wed, 21 Mar 2012 15:48:18 +0000 (08:48 -0700)]
string.h: add __attribute__ ((pure)) to string functions
cdefs.h: Introduce the __purefunc attribute, which allows us to mark
certain functions as being "pure".
http://gcc.gnu.org/onlinedocs/gcc/Function-Attributes.html
Many functions have no effects except the return value and their
return value depends only on the parameters and/or global variables.
Such a function can be subject to common subexpression elimination
and loop optimization just as an arithmetic operator would be.
string.h: Mark many commently used string functions as "pure", to
allow for additional compiler optimizations.
Change-Id: I42961f90f822b6dbcbc3fd72cdbe774a7adc8785
Dima Zavin [Fri, 16 Mar 2012 23:18:15 +0000 (16:18 -0700)]
libc/kernel: Add rules to autogenerate device specific kernel headers
This change will automatically post-process kernel headers
specified by device, board, and product. This will allow us
to not check in each kernel header twice, at least for the
device specific headers for now.
Change-Id: I3bb144b6535504b7c26b807daa75de495554356d
Signed-off-by: Dima Zavin <dima@android.com>
Ben Cheng [Wed, 14 Mar 2012 06:04:57 +0000 (23:04 -0700)]
New additions/bug fixes required/found when porting perf.
New functions:
tfind
tsearch
tdelete
twalk
tdestroy (GNU extension)
Bug fix: the current implementation for realpath would crash
if the second argument (resolved_path) is NULL.
New headers:
ar.h
search.h
Change-Id: Ib6c1e42fc186a6d597a6e5a9692b16acaa155804
Nick Kralevich [Tue, 20 Mar 2012 17:52:42 +0000 (10:52 -0700)]
Merge "linker: fix off-by-one error in GNU_RELRO handling"
Nick Kralevich [Tue, 20 Mar 2012 17:52:23 +0000 (10:52 -0700)]
Merge "linker: initially reserved memory as PROT_NONE"
Nick Kralevich [Fri, 16 Mar 2012 18:38:58 +0000 (11:38 -0700)]
linker: fix off-by-one error in GNU_RELRO handling
Fix a bug where the GNU_RELRO end address could be exactly
the end of the loadable segment.
Change-Id: If6c43acabc06e9aff9217c0f6016e158b28bb41f
Jack Ren [Fri, 16 Mar 2012 08:37:35 +0000 (16:37 +0800)]
bionic: fix atfork hanlder_mutex deadlock
After applying the kernel_id fix, the system refused to boot up and we
got following crash log:
I/DEBUG ( 113): pid: 618, tid: 618 >>> org.simalliance.openmobileapi.service:remote <<<
I/DEBUG ( 113): signal 16 (SIGSTKFLT), code -6 (?), fault addr --------
I/DEBUG ( 113): eax
fffffe00 ebx
b77de994 ecx
00000080 edx
00724002
I/DEBUG ( 113): esi
00000000 edi
00004000
I/DEBUG ( 113): xcs
00000073 xds
0000007b xes
0000007b xfs
00000000 xss
0000007b
I/DEBUG ( 113): eip
b7761351 ebp
bfdf3de8 esp
bfdf3dc4 flags
00000202
I/DEBUG ( 113): #00 eip:
00015351 /system/lib/libc.so
I/DEBUG ( 113): #01 eip:
0000d13c /system/lib/libc.so (pthread_mutex_lock)
I/DEBUG ( 113): #02 eip:
00077b48 /system/lib/libc.so (__bionic_atfork_run_prepare)
I/DEBUG ( 113): #03 eip:
00052cdb /system/lib/libc.so (fork)
I/DEBUG ( 113): #04 eip:
0009ae91 /system/lib/libdvm.so (_Z18dvmOptimizeDexFileillPKcjjb)
I/DEBUG ( 113): #05 eip:
000819d6 /system/lib/libdvm.so (_Z14dvmJarFileOpenPKcS0_PP7JarFileb)
I/DEBUG ( 113): #06 eip:
000b175e /system/lib/libdvm.so (_ZL40Dalvik_dalvik_system_DexFile_openDexFilePKjP6JValue)
I/DEBUG ( 113): #07 eip:
0011fb94 /system/lib/libdvm.so
Root cause:
The atfork uses the mutex handler_mutex to protect the atfork_head. The
parent will call __bionic_atfork_run_prepare() to lock the handler_mutex,
and need both the parent and child to unlock their own copy of handler_mutex
after fork. At that time, the owner of hanlder_mutex is set as the parent.
If we apply the kernel_id fix, then the child's kernel_id will be set as
child's tid.
The handler_mutex is a recursive lock, and pthread_mutex_unlock(&hander_mutex)
will fail because the mutex owner is the parent, while the current tid
(__get_thread()->kernel_id) is child, not matched with the mutex owner.
At that time, the handler_mutex is left in lock state.If the child wants to
fork other process after than, then it will try to lock handler_mutex, and
then be deadlocked.
Fix:
Since the child has its own copy of vm space from the the parent, the
child space's handler_mutex should be reset to the initialized state.
Change-Id: I3907dd9a153418fb78862f2aa6d0302c375d9e27
Signed-off-by: Jack Ren <jack.ren@intel.com>
Signed-off-by: Chenyang Du <chenyang.du@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Nick Kralevich [Fri, 16 Mar 2012 20:06:12 +0000 (13:06 -0700)]
linker: initially reserved memory as PROT_NONE
When the dynamic linker loads a shared library into memory, it
initially allocates a chunk of memory. The memory is then carved
into smaller chunks for each LOAD region, and appropriate memory
protections applied.
Modify the initial memory allocation so that the pages are mapped
as PROT_NONE, rather than PROT_READ / PROT_EXEC. This ensures that
gaps between LOAD regions are not inadvertantly readable / executable.
(Long term, we should munmap() these gaps entirely)
Change-Id: If128a203ccc6fe12dcbbd2bfe0cf13a2045675af
Kenny Root [Fri, 16 Mar 2012 04:59:01 +0000 (21:59 -0700)]
Add in auto-generated if_alg.h header
Change-Id: I5d0934069e74be2eafecdee43074590124db57a7
Ben Cheng [Tue, 13 Mar 2012 20:04:22 +0000 (13:04 -0700)]
Merge "Update kernel headers and add syscall "perf_event_open""
Ben Cheng [Tue, 13 Mar 2012 19:28:40 +0000 (12:28 -0700)]
Update kernel headers and add syscall "perf_event_open"
Change-Id: I43f12b727881df002a8524f2738586c043833bae
Guang Zhu [Tue, 13 Mar 2012 05:05:36 +0000 (22:05 -0700)]
Revert "am
be741d47: am
2f460fbe: am
73b5cad9: Merge "bionic: Fix wrong kernel_id in pthread descriptor after fork()""
This reverts commit
76d56cf4a94e875a8b621025e2780775247adb6e, reversing
changes made to
c59ba4595be25a1213955233fcf9bcd1afe6438e.
Bug:
6157577
Elliott Hughes [Tue, 13 Mar 2012 00:12:35 +0000 (17:12 -0700)]
am
be741d47: am
2f460fbe: am
73b5cad9: Merge "bionic: Fix wrong kernel_id in pthread descriptor after fork()"
* commit '
be741d472868a8ffcb455588f18cda889b0f465c':
bionic: Fix wrong kernel_id in pthread descriptor after fork()
Elliott Hughes [Tue, 13 Mar 2012 00:10:46 +0000 (17:10 -0700)]
am
2f460fbe: am
73b5cad9: Merge "bionic: Fix wrong kernel_id in pthread descriptor after fork()"
* commit '
2f460fbee9abe2936175379c49c6618de7421233':
bionic: Fix wrong kernel_id in pthread descriptor after fork()
Elliott Hughes [Tue, 13 Mar 2012 00:06:09 +0000 (17:06 -0700)]
am
73b5cad9: Merge "bionic: Fix wrong kernel_id in pthread descriptor after fork()"
* commit '
73b5cad989da317cc8089b57ee25f502b1cac71f':
bionic: Fix wrong kernel_id in pthread descriptor after fork()
Elliott Hughes [Mon, 12 Mar 2012 17:32:02 +0000 (10:32 -0700)]
Merge "bionic: Fix wrong kernel_id in pthread descriptor after fork()"
Jack Ren [Tue, 17 Jan 2012 08:27:42 +0000 (16:27 +0800)]
bionic: Fix wrong kernel_id in pthread descriptor after fork()
After forking, the kernel_id field in the phtread_internal_t returned by pthread_self()
is incorrect --- it's the tid from the parent, not the new tid of the
child.
The root cause is that: currently the kernel_id is set by
_init_thread(), which is called in 2 cases:
(1) called by __libc_init_common(). That happens when the execv( ) is
called after fork( ). But when the zygote tries to fork the android
application, the child application doesn't call execv( ), instread, it
tries to call the Java main method directly.
(2) called by pthread_create(). That happens when a new thread is
created.
For the lead thread which is the thread created by fork(), it should
call execv() but it doesn't, as described in (1) above. So its kernel_id
will inherit the parent's kernel_id.
Fixed it in this patch.
Change-Id: I63513e82af40ec5fe51fbb69456b1843e4bc0fc7
Signed-off-by: Chenyang Du <chenyang.du@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Robert Greenwalt [Fri, 9 Mar 2012 19:34:27 +0000 (11:34 -0800)]
Use new binary code format
3-digits + null. Old was 3-digits + space + null.
Change-Id: If5fdf9ced073f432ace3a76858025ad651c74e3d
Andy McFadden [Thu, 8 Mar 2012 19:14:37 +0000 (11:14 -0800)]
Re-throw signals
If we catch a fatal signal that won't automatically re-throw when
the thread resumes, re-throw it manually. (Common examples are
SIGPIPE and the SIGFPE from integer division by zero.)
Change-Id: I329e6d4db907047c555957b42cbd09c50fc808e7
Ben Cheng [Thu, 8 Mar 2012 05:13:49 +0000 (21:13 -0800)]
Update bionic kernel headers using update_all.py
Change-Id: I9c377436e9bf158e7236b3b7dcebf3e79fa961de
Selim Gurun [Thu, 8 Mar 2012 01:05:15 +0000 (17:05 -0800)]
Merge "Prevent potential stall on dns proxy operations."
Ben Cheng [Thu, 8 Mar 2012 00:16:10 +0000 (16:16 -0800)]
Merge "Revert "Update bionic kernel headers using update_all.py""
Ben Cheng [Thu, 8 Mar 2012 00:14:53 +0000 (16:14 -0800)]
Revert "Update bionic kernel headers using update_all.py"
This reverts commit
94a85f663694e1869acb1c2e8a3c374a6fa3ab86
There is a smoke test failure for Prime but Crespo/Stingray are fine. Will revert the change for now until further investigation is made.
Selim Gurun [Mon, 27 Feb 2012 23:58:54 +0000 (15:58 -0800)]
Prevent potential stall on dns proxy operations.
Update wire protocol to return and process error code first.
This will make sure dns proxy operations do not stall when
an internal error happens.
Also fix a compiler warning.
Also fix a potential buffer overflow.
And use correct types (uint32_t) rather than int when reading from network.
Change-Id: I9f99c16d6fd5e9137491a4d1b293a7c78e31b9c3
Ben Cheng [Wed, 7 Mar 2012 21:57:09 +0000 (13:57 -0800)]
Merge "Update bionic kernel headers using update_all.py"
Marco Nelissen [Wed, 7 Mar 2012 21:09:36 +0000 (13:09 -0800)]
Merge "Log the thread id and name for fatal signals."
Marco Nelissen [Wed, 7 Mar 2012 17:04:18 +0000 (09:04 -0800)]
Log the thread id and name for fatal signals.
This adds the thread id and name to the "Fatal signal" logging,
making it easier to track down where in process it actually crashed.
Change-Id: I17a365042b2f10b161debe98bc2e7070af055dfb
Ben Cheng [Tue, 6 Mar 2012 23:45:52 +0000 (15:45 -0800)]
Update bionic kernel headers using update_all.py
Change-Id: I4da6b23cdbce89445f1ca5d2fadeb23345ce694c
Nick Kralevich [Tue, 6 Mar 2012 19:31:59 +0000 (11:31 -0800)]
Merge "Add relro support"
Nick Kralevich [Tue, 28 Feb 2012 18:40:00 +0000 (10:40 -0800)]
Add relro support
Add support for PT_GNU_RELRO. This allows the static linker to
indicate that certain regions of memory should be marked as
"read-only" after dynamic linking is complete.
See:
* http://www.akkadia.org/drepper/nonselsec.pdf (section 6)
* http://tk-blog.blogspot.com/2009/02/relro-not-so-well-known-memory.html
Note that this change has no effect on Android right now, because
we don't compile our code with relro enabled.
Change-Id: I6541f8775367e8558b4388f7d105b1ae6e8f046b
Kenny Root [Mon, 5 Mar 2012 18:46:01 +0000 (10:46 -0800)]
Merge "Revert "Reference __dso_handle in PIC way""
Kenny Root [Mon, 5 Mar 2012 18:45:31 +0000 (10:45 -0800)]
Revert "Reference __dso_handle in PIC way"
This reverts commit
93cb30813764b140f0adbaa620dcdbb1cae56dd8
Kenny Root [Sat, 3 Mar 2012 00:05:57 +0000 (16:05 -0800)]
Merge "Reference __dso_handle in PIC way"
Kenny Root [Fri, 2 Mar 2012 21:05:25 +0000 (13:05 -0800)]
Reference __dso_handle in PIC way
Use the same pattern in atexit.S to reference __dso_handle in a way that
doesn't require a TEXTREL flag to be set.
Change-Id: Id69d20863ee203d2b2f7ef0db230f9b548657741
Elliott Hughes [Fri, 2 Mar 2012 19:13:05 +0000 (11:13 -0800)]
am
6d074bb7: am
70d1d45f: am
a58c88c2: Merge "Upgrade to tzdata2012b."
* commit '
6d074bb71a316f73f35f4430a71fa706c46d4b75':
Upgrade to tzdata2012b.
Elliott Hughes [Fri, 2 Mar 2012 19:10:43 +0000 (11:10 -0800)]
am
70d1d45f: am
a58c88c2: Merge "Upgrade to tzdata2012b."
* commit '
70d1d45f0ecaee262627a6ca323fc2b4fe3e9024':
Upgrade to tzdata2012b.
Elliott Hughes [Fri, 2 Mar 2012 19:07:03 +0000 (11:07 -0800)]
am
a58c88c2: Merge "Upgrade to tzdata2012b."
* commit '
a58c88c235bfeeb17ac495991e66f7b906935852':
Upgrade to tzdata2012b.
Elliott Hughes [Fri, 2 Mar 2012 18:49:45 +0000 (10:49 -0800)]
am
a2b1bbc9: am
a480cf93: resolved conflicts for merge of
cfe535ef to stage-aosp-master
* commit '
a2b1bbc9a605819eb5ecd1df61d4f2a79f1a8f92':
Upgrade to tzdata2011a.
Elliott Hughes [Fri, 2 Mar 2012 18:47:23 +0000 (10:47 -0800)]
am
a480cf93: resolved conflicts for merge of
cfe535ef to stage-aosp-master
* commit '
a480cf930f31ab404e7efe66259427a53d72fa2b':
Upgrade to tzdata2011a.
Elliott Hughes [Fri, 2 Mar 2012 18:11:18 +0000 (10:11 -0800)]
resolved conflicts for merge of
cfe535ef to stage-aosp-master
Change-Id: I21a1dd41503518e75892180c14f1ce79102772ad
Elliott Hughes [Fri, 2 Mar 2012 08:09:03 +0000 (00:09 -0800)]
Merge "Upgrade to tzdata2012b."
Elliott Hughes [Fri, 2 Mar 2012 07:34:11 +0000 (23:34 -0800)]
Upgrade to tzdata2012b.
Summer time in Cuba has been delayed 3 weeks (now starts April 1 rather
than March 11). Since March 11 (the old start date, as listed in 2012a)
is just a little over a week away, this change is urgent.
Change-Id: Iadf4dc30072bdac0bcd0ad4b9e076a9ca071efbe
Elliott Hughes [Fri, 2 Mar 2012 07:32:14 +0000 (23:32 -0800)]
Merge "Upgrade to tzdata2011a."
Jean-Baptiste Queru [Thu, 1 Mar 2012 23:35:45 +0000 (15:35 -0800)]
am
cff86bdc: am
018c27ed: am
25f2d1f0: Merge "update stddef.h"
* commit '
cff86bdc02f70bb5758234ace75a2f84a626cc3c':
update stddef.h
Jean-Baptiste Queru [Thu, 1 Mar 2012 23:35:44 +0000 (15:35 -0800)]
am
568ee0d1: am
51d22d7e: am
afab5a70: Merge "Eliminate duplicate constants"
* commit '
568ee0d135c23c5a49fb4f93de01999b76523428':
Eliminate duplicate constants
Jean-Baptiste Queru [Thu, 1 Mar 2012 23:35:20 +0000 (15:35 -0800)]
am
dc755140: (-s ours) am
7c38f53d: am
7f28e0b4: Merge "Clean up the remnants of SuperH support"
* commit '
dc755140c11bb0ff64f7c3d224dd5588fc643485':
Clean up the remnants of SuperH support
Elliott Hughes [Thu, 1 Mar 2012 17:38:31 +0000 (09:38 -0800)]
Upgrade to tzdata2011a.
From the notes:
Chile 2011/2012 and 2012/2013 summer time date adjustments.
Falkland Islands onto permanent summer time (we're assuming for the
foreseeable future, though 2012 is all we're fairly certain of.)
Armenia has abolished Summer Time.
Tokelau jumped the International Date Line back last December
(just the same as their near neighbour, Samoa).
America/Creston is a new zone for a small area of British Columbia
There will be a leapsecod 2012-06-30 23:59:60 UTC.
Change-Id: I1d66edf8d33fd1dbcf21178def91844025fd9047
Jean-Baptiste Queru [Thu, 1 Mar 2012 03:12:17 +0000 (19:12 -0800)]
am
018c27ed: am
25f2d1f0: Merge "update stddef.h"
* commit '
018c27eda89b54e59e6c043ea2986c6e39ec2ee0':
update stddef.h
Jean-Baptiste Queru [Thu, 1 Mar 2012 03:12:16 +0000 (19:12 -0800)]
am
51d22d7e: am
afab5a70: Merge "Eliminate duplicate constants"
* commit '
51d22d7ea92e77f47accee59c99cb8157bf29fcb':
Eliminate duplicate constants
Jean-Baptiste Queru [Thu, 1 Mar 2012 03:08:50 +0000 (19:08 -0800)]
am
25f2d1f0: Merge "update stddef.h"
* commit '
25f2d1f0c3c7802af0d4d1e2bbd3bf95a7e0970b':
update stddef.h
Jean-Baptiste Queru [Thu, 1 Mar 2012 03:08:49 +0000 (19:08 -0800)]
am
afab5a70: Merge "Eliminate duplicate constants"
* commit '
afab5a703d30df613848cb30ab3ecceafd76102b':
Eliminate duplicate constants
Jean-Baptiste Queru [Thu, 1 Mar 2012 02:59:15 +0000 (18:59 -0800)]
Merge "update stddef.h"
Jean-Baptiste Queru [Thu, 1 Mar 2012 02:58:52 +0000 (18:58 -0800)]
Merge "Eliminate duplicate constants"
Nick Kralevich [Tue, 28 Feb 2012 21:36:31 +0000 (13:36 -0800)]
update stddef.h
Pull in an updated version of stddef.h from the linux kernel.
Pulled from upstream kernel at
891003abb0db6bfffd61b76ad0ed39bb7c3db8e1
This file was generated using the following command:
cd bionic/libc/kernel/
./tools/clean_header.py -u ../../../external/kernel-headers/original/linux/stddef.h
Change-Id: I6c29f3fa100c5368da41d0f0da39bc50fa668e9d
Nick Kralevich [Tue, 28 Feb 2012 19:49:41 +0000 (11:49 -0800)]
Eliminate duplicate constants
include/elf.h contains basically the same values as
linux/auxvec.h. Eliminate dups.
include/sys/exec_elf.h contains basically the same
values as linux/elf.h. Eliminate dups.
Change-Id: I66b8358161bb52223bb657f8f73ba28b324f4fa3
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:43:24 +0000 (15:43 -0800)]
am
7c38f53d: am
7f28e0b4: Merge "Clean up the remnants of SuperH support"
* commit '
7c38f53d1911e04acf6398921a7bd4444d585c2b':
Clean up the remnants of SuperH support
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:38:55 +0000 (15:38 -0800)]
am
7f28e0b4: Merge "Clean up the remnants of SuperH support"
* commit '
7f28e0b4501de7c4f8f627fd3e4be323d737ae82':
Clean up the remnants of SuperH support
Jean-Baptiste Queru [Wed, 29 Feb 2012 22:39:41 +0000 (14:39 -0800)]
Merge "Clean up the remnants of SuperH support"
Nick Kralevich [Wed, 29 Feb 2012 21:30:48 +0000 (13:30 -0800)]
Merge "Eliminate duplicate constants"