Nick Kralevich
4e3ed44db1
Merge "cdefs.h: introduce __bos0"
2013-08-28 21:31:55 +00:00
Nick Kralevich
bd8e6749b7
cdefs.h: introduce __bos0
...
Introduce __bos0 as a #define for __builtin_object_size((s), 0).
This macro is intended to be used for places where the standard
__bos macro isn't appropriate.
memcpy, memmove, and memset deliberately use __bos0. This is done
for two reasons:
1) I haven't yet tested to see if __bos is safe to use.
2) glibc uses __bos0 for these methods.
Change-Id: Ifbe02efdb10a72fe3529dbcc47ff647bde6feeca
2013-08-28 14:27:14 -07:00
Nick Kralevich
f135c2c44a
am 2c87c3ff
: am cfd0d72d
: am eb8f3622
: Merge "FORTIFY_SOURCE: introduce __strncpy_chk2"
...
* commit '2c87c3ff021571e82684a865609a1146830338fb':
FORTIFY_SOURCE: introduce __strncpy_chk2
2013-08-28 14:07:10 -07:00
Nick Kralevich
2c87c3ff02
am cfd0d72d
: am eb8f3622
: Merge "FORTIFY_SOURCE: introduce __strncpy_chk2"
...
* commit 'cfd0d72da8641087f9c4015ee586614da9f7320a':
FORTIFY_SOURCE: introduce __strncpy_chk2
2013-08-28 13:07:57 -07:00
Nick Kralevich
cfd0d72da8
am eb8f3622
: Merge "FORTIFY_SOURCE: introduce __strncpy_chk2"
...
* commit 'eb8f36223e51db626a23b8032f03c095be80998b':
FORTIFY_SOURCE: introduce __strncpy_chk2
2013-08-28 13:05:38 -07:00
Nick Kralevich
eb8f36223e
Merge "FORTIFY_SOURCE: introduce __strncpy_chk2"
2013-08-28 20:04:06 +00:00
Nick Kralevich
93501d3ab8
FORTIFY_SOURCE: introduce __strncpy_chk2
...
This change detects programs reading beyond the end of "src" when
calling strncpy.
Change-Id: Ie1b42de923385d62552b22c27b2d4713ab77ee03
2013-08-28 12:39:06 -07:00
Christopher Ferris
8501fa38d7
am 7c8ebaf6
: am d923b307
: am 2557433d
: Merge "Change hard-coded directory."
...
* commit '7c8ebaf6c17c11854ae394ac7fa45c51489de75a':
Change hard-coded directory.
2013-08-27 17:43:41 -07:00
Christopher Ferris
7c8ebaf6c1
am d923b307
: am 2557433d
: Merge "Change hard-coded directory."
...
* commit 'd923b3075c9cf9e0749cee7373cabb9afba9420c':
Change hard-coded directory.
2013-08-27 17:41:17 -07:00
Christopher Ferris
d923b3075c
am 2557433d
: Merge "Change hard-coded directory."
...
* commit '2557433d8ea4c489f061170822f34f038b930b96':
Change hard-coded directory.
2013-08-27 17:38:07 -07:00
Christopher Ferris
2557433d8e
Merge "Change hard-coded directory."
2013-08-28 00:35:12 +00:00
Christopher Ferris
ef17f8dda6
am 3825da5c
: am 7a2c2784
: am 1f216e30
: Merge "Create bionic unit test library for use with CTS."
...
* commit '3825da5c0734215d179ce613681322fb5be3bfbe':
Create bionic unit test library for use with CTS.
2013-08-27 17:25:10 -07:00
Christopher Ferris
3825da5c07
am 7a2c2784
: am 1f216e30
: Merge "Create bionic unit test library for use with CTS."
...
* commit '7a2c2784a656adfae613b6b53d388988d6f2efa6':
Create bionic unit test library for use with CTS.
2013-08-27 17:22:37 -07:00
Christopher Ferris
5227bb363d
Change hard-coded directory.
...
The tests are using /data/data which is not accessible to a non-root
user. Change this to /data/local/tmp which is accessible to all users.
Bug: 8291716
Change-Id: I66476bbbaf5d1dc0c103863abf9219405f06a85b
2013-08-27 17:22:34 -07:00
Christopher Ferris
7a2c2784a6
am 1f216e30
: Merge "Create bionic unit test library for use with CTS."
...
* commit '1f216e30b6a9301211193d05f995cdefbdc9619f':
Create bionic unit test library for use with CTS.
2013-08-27 17:20:39 -07:00
Christopher Ferris
1f216e30b6
Merge "Create bionic unit test library for use with CTS."
2013-08-28 00:19:06 +00:00
Nick Kralevich
259de5897b
am f6186e95
: am 1278ae38
: am 22f5ef6b
: Merge "Delete CAVEATS / fix spelling."
...
* commit 'f6186e95929b8da3d90057648475301bf6ee03d2':
Delete CAVEATS / fix spelling.
2013-08-27 17:15:36 -07:00
Nick Kralevich
f6186e9592
am 1278ae38
: am 22f5ef6b
: Merge "Delete CAVEATS / fix spelling."
...
* commit '1278ae38366102369b5a35152f2213426a148512':
Delete CAVEATS / fix spelling.
2013-08-27 17:11:06 -07:00
Nick Kralevich
1278ae3836
am 22f5ef6b
: Merge "Delete CAVEATS / fix spelling."
...
* commit '22f5ef6b84057bf56f023263859a9b45eccd620b':
Delete CAVEATS / fix spelling.
2013-08-27 17:08:11 -07:00
Nick Kralevich
22f5ef6b84
Merge "Delete CAVEATS / fix spelling."
2013-08-28 00:06:19 +00:00
Nick Kralevich
bdbdbb8319
Delete CAVEATS / fix spelling.
...
Change-Id: I0ed504271b7c2e4434d0d5f53bc10335c8cf7b5b
2013-08-27 17:05:19 -07:00
Christopher Ferris
153d92765b
Create bionic unit test library for use with CTS.
...
Bug: 8291716
Change-Id: I46b749348456fae7892eecca6b44aef51a0e4747
2013-08-27 14:35:56 -07:00
The Android Automerger
da4bedf52f
merge in klp-release history after reset to klp-dev
2013-08-27 06:00:58 -07:00
Brian Carlstrom
61a5be7574
am 112ad6bf
: am 6ab75bf4
: Merge "Fix pthread_getcpuclockid." into klp-dev
...
* commit '112ad6bf2183ba105b4f4c2b7eba58066a3312d7':
Fix pthread_getcpuclockid.
2013-08-26 15:17:06 -07:00
Robert Greenwalt
76d93d6002
am cd1480a6
: am 26ac8032
: Merge "Change how DNS resolver handle no default iface" into klp-dev
...
* commit 'cd1480a6622de1043645093b29beee43e0671048':
Change how DNS resolver handle no default iface
2013-08-26 15:17:05 -07:00
Brian Carlstrom
112ad6bf21
am 6ab75bf4
: Merge "Fix pthread_getcpuclockid." into klp-dev
...
* commit '6ab75bf41e5ca24f5d313673b8a05e2dbb803106':
Fix pthread_getcpuclockid.
2013-08-26 15:05:30 -07:00
Robert Greenwalt
cd1480a662
am 26ac8032
: Merge "Change how DNS resolver handle no default iface" into klp-dev
...
* commit '26ac803232540fc074709c75d17bc3ec0c03f2c4':
Change how DNS resolver handle no default iface
2013-08-26 15:03:44 -07:00
Brian Carlstrom
6ab75bf41e
Merge "Fix pthread_getcpuclockid." into klp-dev
2013-08-26 21:21:17 +00:00
Jeff Hao
e9e10c13ff
Fix pthread_getcpuclockid.
...
clock_gettime was returning EINVAL for the values
produced by pthread_getcpuclockid.
Bug: 10346183
(cherry picked from commit 9b06cc3c1b
)
Change-Id: Ib81a7024c218a4502f256c3002b9030e2aaa278d
2013-08-26 14:04:16 -07:00
Elliott Hughes
3dbb077c5a
am bda15698
: am d23ef69a
: am 33dd7c11
: Merge "Add explicit -m32/-melf_i386 for x86 target"
...
* commit 'bda15698bc59ba307f5faabf7efd22ae9ecac136':
Add explicit -m32/-melf_i386 for x86 target
2013-08-26 10:13:20 -07:00
Elliott Hughes
bda15698bc
am d23ef69a
: am 33dd7c11
: Merge "Add explicit -m32/-melf_i386 for x86 target"
...
* commit 'd23ef69ad1d089c10547ac3d42ba199b66260ae3':
Add explicit -m32/-melf_i386 for x86 target
2013-08-26 10:11:55 -07:00
Elliott Hughes
d23ef69ad1
am 33dd7c11
: Merge "Add explicit -m32/-melf_i386 for x86 target"
...
* commit '33dd7c116d652223b5bf3dabe49641c310d1216b':
Add explicit -m32/-melf_i386 for x86 target
2013-08-26 10:09:36 -07:00
Elliott Hughes
33dd7c116d
Merge "Add explicit -m32/-melf_i386 for x86 target"
2013-08-26 17:05:31 +00:00
The Android Automerger
8eca269b4b
merge in klp-release history after reset to klp-dev
2013-08-26 06:00:41 -07:00
Robert Greenwalt
8b1cc6ceb8
am e5911f31
: resolved conflicts for merge of 937c3742
to klp-dev-plus-aosp
...
* commit 'e5911f31286179c1e4dc9bb2691e5098c6e3d20e':
Change how DNS resolver handle no default iface
2013-08-24 08:25:39 -07:00
Robert Greenwalt
e5911f3128
resolved conflicts for merge of 937c3742
to klp-dev-plus-aosp
...
Change-Id: I4c0ad42ea3802cd232c80e5589af8a8e25f88a60
2013-08-24 08:21:41 -07:00
Robert Greenwalt
937c374225
am c6135ba7
: Merge "Change how DNS resolver handle no default iface"
...
* commit 'c6135ba76db027d85751f84bf648a865609c0e1b':
Change how DNS resolver handle no default iface
2013-08-24 05:40:18 -07:00
Robert Greenwalt
c6135ba76d
Merge "Change how DNS resolver handle no default iface"
2013-08-24 12:35:08 +00:00
Robert Greenwalt
26ac803232
Merge "Change how DNS resolver handle no default iface" into klp-dev
2013-08-24 12:20:01 +00:00
Robert Greenwalt
d67662b9d6
Change how DNS resolver handle no default iface
...
We used to just try any iface we'd been told about as a
fallback, but that will end up mistakenly using a secondary
network's dns when we really don't have a default connection.
It also messed up our detection of whether we were doing the
lookup on the default or not (we'd get back our secondary net
iface as the default, do the compare and think we were on default).
Remove the lies and let dns fail if we don't have an iface for it.
bug:10132565
Conflicts:
libc/netbsd/resolv/res_cache.c
Change-Id: I357a9c34dad83215f44c5e0dd41ce2a7d6fe8f3f
2013-08-23 11:48:26 -07:00
Pavel Chupin
e85c183424
Add explicit -m32/-melf_i386 for x86 target
...
Required for x86 build with multilib compiler.
Change-Id: Iac71cdc3461df6fb48cb2a7b713324ca368e6704
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2013-08-23 16:46:42 +04:00
Robert Greenwalt
a31ddef36d
Change how DNS resolver handle no default iface
...
We used to just try any iface we'd been told about as a
fallback, but that will end up mistakenly using a secondary
network's dns when we really don't have a default connection.
It also messed up our detection of whether we were doing the
lookup on the default or not (we'd get back our secondary net
iface as the default, do the compare and think we were on default).
Remove the lies and let dns fail if we don't have an iface for it.
bug:10132565
Change-Id: I5f0f2abacaaaaf23c5292b20fba9d8dcb6fb10c5
2013-08-22 21:05:49 -07:00
Elliott Hughes
aa3defdecb
am 9fd0cf81
: am 345eb225
: Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a.
...
* commit '9fd0cf81702d083b39a839b07ad75d2ff0ac277d':
Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a.
2013-08-22 14:36:54 -07:00
Elliott Hughes
b58a14df12
am 2d38fced
: am 7003a14b
: am 41f08abf
: Merge "Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a."
...
* commit '2d38fced00a873da8077a5193b2d5ef8603dcc66':
Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a.
2013-08-22 14:36:54 -07:00
Elliott Hughes
9fd0cf8170
am 345eb225
: Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a.
...
* commit '345eb225ae2e87e36354be5f1e62301179482804':
Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a.
2013-08-22 14:34:14 -07:00
Elliott Hughes
2d38fced00
am 7003a14b
: am 41f08abf
: Merge "Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a."
...
* commit '7003a14b536bad08476d2f2005ebcc0490b77b24':
Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a.
2013-08-22 14:32:44 -07:00
Elliott Hughes
7003a14b53
am 41f08abf
: Merge "Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a."
...
* commit '41f08abf3d020ad8b48ff4151f8c623a119790e0':
Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a.
2013-08-22 14:30:42 -07:00
Elliott Hughes
345eb225ae
Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a.
...
Author: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu Aug 22 12:47:51 2013 -0700
* localtime.c: Fix another integer overflow bug in mktime.
(time2sub): Avoid undefined behavior on time_t overflow.
Reported by Elliott Hughes in
<http://mm.icann.org/pipermail/tz/2013-August/019580.html >.
Bug: 10310929
(cherry picked from commit 713fe6463e
)
Change-Id: I9ec79fd8d825e6b9e8bb5af549dbfc2182346c05
2013-08-22 14:29:07 -07:00
Elliott Hughes
41f08abf3d
Merge "Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a."
2013-08-22 21:27:55 +00:00
Elliott Hughes
713fe6463e
Apply upstream commit 943a6621866e9d6e654f5cfe1494378c1fb8957a.
...
Author: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu Aug 22 12:47:51 2013 -0700
* localtime.c: Fix another integer overflow bug in mktime.
(time2sub): Avoid undefined behavior on time_t overflow.
Reported by Elliott Hughes in
<http://mm.icann.org/pipermail/tz/2013-August/019580.html >.
Bug: 10310929
Change-Id: I3bf26f1f91371552e0a3828457d27e22af55acb2
2013-08-22 14:18:04 -07:00