Todd Poynor
23b9fd2c1d
libc: add clock ids CLOCK_REALTIME_ALARM and CLOCK_BOOTTIME_ALARM
...
(cherry-pick of b928bda83d4413b703329f607e2706602f15293f.)
Change-Id: Ica6aad84299819ffc5e57ae4891e057d2e401fa1
2013-05-14 14:43:09 -07:00
Elliott Hughes
509fc80697
am d8a9cccb: Merge "Fix all printf warnings in res_send.c."
...
* commit 'd8a9cccb4d77eecc36425c9240a12bd305031ee3':
Fix all printf warnings in res_send.c.
2013-05-14 11:10:23 -07:00
Elliott Hughes
d8a9cccb4d
Merge "Fix all printf warnings in res_send.c."
2013-05-14 17:10:21 +00:00
Kito Cheng
bb0b09cad6
Fix all printf warnings in res_send.c.
...
Change-Id: I4bf959140b5a5475897bd80704e64e3c4645fc3f
2013-05-14 10:09:23 -07:00
The Android Automerger
d146e8e4e9
merge in jb-mr2-release history after reset to jb-mr2-dev
android-4.3_r2.3
android-4.3_r2.2
android-4.3_r2.1
android-4.3_r2
android-4.3_r1.1
android-4.3_r1
android-4.3_r0.9.1
android-4.3_r0.9
2013-05-13 05:55:12 -07:00
Elliott Hughes
30d7485dd3
am 738370d9: Don\'t fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors.
...
* commit '738370d9387396922c10910edb61272e585be107':
Don't fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors.
2013-05-09 23:40:47 -07:00
Elliott Hughes
58f3dbdacd
am 98f7659d: Merge "Don\'t fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors."
...
* commit '98f7659d7e3a7d75c68a41299f6ee55d7d35c27b':
Don't fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors.
2013-05-09 17:53:38 -07:00
Elliott Hughes
738370d938
Don't fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors.
...
The GNU dynamic linker silently ignores a DT_PREINIT_ARRAY section
in a shared library. We had ineffectual code that tried to report
an error, which I tried to fix but got wrong --- my version still
wouldn't report the error to the caller, but would prevent us from
continuing to call constructors.
Bug: 8825226
(cherry picked from commit 8147d3c284932896ab6095232b355979b9eb33d3)
Change-Id: Iad8e7e3743d1a5e6bd1d44ef40b1ab3499cb64f2
android-4.3.1_r1
android-4.3_r3.1
android-4.3_r3
2013-05-09 15:53:30 -07:00
Elliott Hughes
98f7659d7e
Merge "Don't fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors."
2013-05-09 22:30:21 +00:00
Elliott Hughes
8147d3c284
Don't fail to run DT_INIT and DT_INIT_ARRAY constructors if a shared library has DT_PREINIT_ARRAY constructors.
...
The GNU dynamic linker silently ignores a DT_PREINIT_ARRAY section
in a shared library. We had ineffectual code that tried to report
an error, which I tried to fix but got wrong --- my version still
wouldn't report the error to the caller, but would prevent us from
continuing to call constructors.
Bug: 8825226
Change-Id: I4fd8450ecc44d8767a1cb808aeecfbfbfc77c070
2013-05-09 15:29:54 -07:00
Ben Cheng
ca54ae44a4
am 262b7384: Adjust PC value in ARM stack trace.
...
* commit '262b7384e4e691d42070a57472ecc64cf668c480':
Adjust PC value in ARM stack trace.
2013-05-09 09:37:50 -07:00
Ben Cheng
49f6e97062
am ff220f70: Merge "Remove a spurious FIXME and unnecessary type cast."
...
* commit 'ff220f70036178aa0d7dcf1cbc4825085a84441e':
Remove a spurious FIXME and unnecessary type cast.
2013-05-08 13:26:12 -07:00
Ben Cheng
3353e6535a
am b9256ada: Merge "Adjust PC value in ARM stack trace."
...
* commit 'b9256adab3aa7e7628d7bbd015132a511de7a43d':
Adjust PC value in ARM stack trace.
2013-05-08 13:26:11 -07:00
Nick Kralevich
37cd8800d5
am d541ba17: Merge "Use restrict pointers for various libc functions."
...
* commit 'd541ba17197fd3ef1f60462e51261c4340369218':
Use restrict pointers for various libc functions.
2013-05-08 13:26:11 -07:00
Ben Cheng
262b7384e4
Adjust PC value in ARM stack trace.
...
-2 for Thumb BLX(2) or -4 for the rest.
Change-Id: Ie59351a0012c2267309f63f0462fdba4698846fe
2013-05-08 11:21:53 -07:00
Ben Cheng
ff220f7003
Merge "Remove a spurious FIXME and unnecessary type cast."
2013-05-07 23:56:11 +00:00
Ben Cheng
63dd03cced
Remove a spurious FIXME and unnecessary type cast.
...
Change-Id: I05dcefdec7f047bef7eef5c5ceb7453992d56c24
2013-05-07 16:53:33 -07:00
Ben Cheng
b9256adab3
Merge "Adjust PC value in ARM stack trace."
2013-05-07 22:45:42 +00:00
Ben Cheng
52171b9bdc
Adjust PC value in ARM stack trace.
...
-2 for Thumb BLX(2) or -4 for the rest.
Change-Id: I804fdabfa1db4709bede222d4b432e8d42d53167
2013-05-07 15:44:13 -07:00
Nick Kralevich
d541ba1719
Merge "Use restrict pointers for various libc functions."
2013-05-07 17:37:48 +00:00
Nick Kralevich
1c462b7a04
Use restrict pointers for various libc functions.
...
All the cool kids say this is the best thing since sliced bread.
http://cellperformance.beyond3d.com/articles/2006/05/demystifying-the-restrict-keyword.html
For the most part, these changes match what glibc does.
Change-Id: I176268f27f82800162fe5f2515b08d5469ea2dfe
2013-05-07 10:00:21 -07:00
Nick Kralevich
c9757ac81e
am b01f7afd: Merge "Use __predict_false on some fortify methods."
...
* commit 'b01f7afd5fd5df5f8fe925b4fe493269191b62a2':
Use __predict_false on some fortify methods.
2013-05-02 14:56:37 -07:00
Nick Kralevich
b01f7afd5f
Merge "Use __predict_false on some fortify methods."
2013-05-02 21:52:19 +00:00
Nick Kralevich
532d6f09b1
Use __predict_false on some fortify methods.
...
Give the compiler some hints that these error conditions
are unlikely to occur in practice.
Change-Id: Ifaf7322a12120ef663c8315c1a18c2dcbe4bda23
2013-05-02 14:31:51 -07:00
Nick Kralevich
4f614a7036
am e4ac8feb: Merge "libc: cleanup strchr"
...
* commit 'e4ac8feb58ed1f963db9a1f32fa74a06a1f594f2':
libc: cleanup strchr
2013-05-02 14:25:42 -07:00
Nick Kralevich
e4ac8feb58
Merge "libc: cleanup strchr"
2013-05-02 21:17:16 +00:00
Nick Kralevich
4f40e511b0
libc: cleanup strchr
...
Move strchr to a .cpp file, and change to bionic directory.
Change-Id: I64ade7df326c0a9a714aca4caf5647b6833b1c97
2013-05-02 13:58:03 -07:00
Nick Kralevich
65fe3ea708
am 5e3b502b: Merge "keep test names consistent with other tests."
...
* commit '5e3b502b6b56634953ea152409363088974fa5e9':
keep test names consistent with other tests.
2013-05-01 15:10:07 -07:00
Nick Kralevich
b9aab3a462
am 8c00c91a: Merge "add strrchr -D_FORTIFY_SOURCE=2 test."
...
* commit '8c00c91aa051f18e107466b5d8c9280a2e1fabc1':
add strrchr -D_FORTIFY_SOURCE=2 test.
2013-05-01 15:10:07 -07:00
Nick Kralevich
5e3b502b6b
Merge "keep test names consistent with other tests."
2013-05-01 22:06:15 +00:00
Nick Kralevich
277226bf43
keep test names consistent with other tests.
...
Change-Id: I23dc4d963af40406b270af83cd17f6c8c95f1de3
2013-05-01 15:05:01 -07:00
Nick Kralevich
8c00c91aa0
Merge "add strrchr -D_FORTIFY_SOURCE=2 test."
2013-05-01 22:01:20 +00:00
Nick Kralevich
80541922e3
add strrchr -D_FORTIFY_SOURCE=2 test.
...
Change-Id: I1b95bb0086ae9f2f506f3cc90cee834c0ce3b1d8
2013-05-01 14:55:33 -07:00
Nick Kralevich
8355ab5524
am bee0ab16: Merge "libc: upgrade strrchr to FORTIFY_SOURCE=2"
...
* commit 'bee0ab16e47086d2f31f6f9ff41328066d5a7128':
libc: upgrade strrchr to FORTIFY_SOURCE=2
2013-04-30 16:25:23 -07:00
Nick Kralevich
bee0ab16e4
Merge "libc: upgrade strrchr to FORTIFY_SOURCE=2"
2013-04-30 23:13:04 +00:00
Nick Kralevich
3b2e6bc9ac
libc: upgrade strrchr to FORTIFY_SOURCE=2
...
Change-Id: I4c34c2ce22c5092c4446dc1ab55f37604c1c223f
2013-04-30 14:19:23 -07:00
Nick Kralevich
2ff94a0964
am c4687130: Merge "libc: upgrade some libc functions to _FORTIFY_SOURCE=2"
...
* commit 'c46871302e7bd099aaf54d91da93a2248acbf733':
libc: upgrade some libc functions to _FORTIFY_SOURCE=2
2013-04-30 11:56:08 -07:00
Nick Kralevich
c46871302e
Merge "libc: upgrade some libc functions to _FORTIFY_SOURCE=2"
2013-04-30 18:51:22 +00:00
Nick Kralevich
9020fd503c
libc: upgrade some libc functions to _FORTIFY_SOURCE=2
...
Upgrade the following functions:
* vsnprintf
* vsprintf
* snprintf
* fgets
* strcpy
* strcat
* strncat
* strlcpy
* strlcat
* strlen
* strchr
Change-Id: Icc036fc7f0bb317e05f7c051617887a1601271aa
2013-04-30 11:31:35 -07:00
Nick Kralevich
aed0c3ac54
am b94b2851: Merge "libc: upgrade sprintf to _FORTIFY_SOURCE=2"
...
* commit 'b94b2851d72187cc9095864a9c99429ee62d7786':
libc: upgrade sprintf to _FORTIFY_SOURCE=2
2013-04-29 16:56:29 -07:00
Nick Kralevich
b94b2851d7
Merge "libc: upgrade sprintf to _FORTIFY_SOURCE=2"
2013-04-29 23:50:46 +00:00
Nick Kralevich
78d6d9888c
libc: upgrade sprintf to _FORTIFY_SOURCE=2
...
Upgrade sprintf to fortify_source level 2, to catch
additional security bugs.
Change-Id: Ibc957d65e4cb96152de84b3745a04e00fa22659e
2013-04-29 16:41:54 -07:00
Nick Kralevich
56a1b492c4
am 382a7753: Merge "strncpy: implement _FORTIFY_SOURCE=2"
...
* commit '382a7753786646483a8101f4e337f9e3a82ec852':
strncpy: implement _FORTIFY_SOURCE=2
2013-04-29 16:25:41 -07:00
Nick Kralevich
382a775378
Merge "strncpy: implement _FORTIFY_SOURCE=2"
2013-04-29 23:07:33 +00:00
Nick Kralevich
1aae9bd170
strncpy: implement _FORTIFY_SOURCE=2
...
Add support for fortify source level 2 to strncpy.
This will enable detection of more areas where strncpy
is used inappropriately. For example, this would have detected
bug 8727221.
Move the fortify_source tests out of string_test.cpp, and
put it into fortify1_test.cpp.
Create a new fortify2_test.cpp file, which copies all
the tests in fortify1_test.cpp, and adds fortify_source level
2 specific tests.
Change-Id: Ica0fba531cc7d0609e4f23b8176739b13f7f7a83
2013-04-29 15:22:10 -07:00
Nick Kralevich
89357dc730
am c6dc62f0: Merge "[NETFILTER]: Fix iptables ABI breakage"
...
* commit 'c6dc62f09c814b9688aee83e80dcfe80cb0ef604':
[NETFILTER]: Fix iptables ABI breakage
2013-04-29 12:51:35 -07:00
Nick Kralevich
c6dc62f09c
Merge "[NETFILTER]: Fix iptables ABI breakage"
2013-04-29 19:44:30 +00:00
Nick Kralevich
e66ad7809e
[NETFILTER]: Fix iptables ABI breakage
...
Pick up Linux kernel patch 2748e5dec7ca8a3804852c7c4171f9156384d15c
from 2007
http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=2748e5dec7ca8a3804852c7c4171f9156384d15c
[NETFILTER]: Fix iptables ABI breakage on (at least) CRIS
With the introduction of x_tables we accidentally broke compatibility
by defining IPT_TABLE_MAXNAMELEN to XT_FUNCTION_MAXNAMELEN instead of
XT_TABLE_MAXNAMELEN, which is two bytes larger.
On most architectures it doesn't really matter since we don't have
any tables with names that long in the kernel and the structure
layout didn't change because of alignment requirements of following
members. On CRIS however (and other architectures that don't align
data) this changed the structure layout and thus broke compatibility
with old iptables binaries.
Changing it back will break compatibility with binaries compiled
against recent kernels again, but since the breakage has only been
there for three releases this seems like the better choice.
Change-Id: Ie9552b25892109c7042b9752132dc8ebd3552dc3
2013-04-29 12:31:01 -07:00
Andrew Hsieh
83966db80b
am f7153fd1: Merge "Remove redundant space within square brackets"
...
* commit 'f7153fd13f469e9ba5aecbfa00fde42530ca2124':
Remove redundant space within square brackets
2013-04-25 21:22:26 -07:00
Andrew Hsieh
f7153fd13f
Merge "Remove redundant space within square brackets"
2013-04-26 01:54:38 +00:00