Elliott Hughes
56326d14b5
am e0d1d4cf
: am 6ebc24fc
: am d3f9e815
: resolved conflicts for merge of 5d0ad38c
to jb-mr2-dev
...
* commit 'e0d1d4cf497bddd8f24b6d22feec33d655cae0dd':
Upgrade pre-jb-mr2 releases to tzdata2013d.
2013-09-13 17:13:46 -07:00
Brian Carlstrom
4105fcdb3c
am 059f5c3f
: am 8512992f
: Merge "Simplify main thread stack size initialization"
...
* commit '059f5c3f6ce2a1783b5d96b4059df1b9104101d5':
Simplify main thread stack size initialization
2013-09-13 17:05:20 -07:00
Brian Carlstrom
d062806699
am 5f0b5108
: am 850f59d8
: Merge "Use kernel default for initial thread size"
...
* commit '5f0b5108e340bddca796b7b8d2b072e30ccea112':
Use kernel default for initial thread size
2013-09-13 17:05:20 -07:00
Brian Carlstrom
059f5c3f6c
am 8512992f
: Merge "Simplify main thread stack size initialization"
...
* commit '8512992f50e8444c1985bbeb17c3385a58fc0fed':
Simplify main thread stack size initialization
2013-09-13 17:02:51 -07:00
Brian Carlstrom
5f0b5108e3
am 850f59d8
: Merge "Use kernel default for initial thread size"
...
* commit '850f59d8516c7060be9484e9771aa54231e8ff48':
Use kernel default for initial thread size
2013-09-13 17:02:50 -07:00
Brian Carlstrom
8512992f50
Merge "Simplify main thread stack size initialization"
2013-09-14 00:00:41 +00:00
Brian Carlstrom
850f59d851
Merge "Use kernel default for initial thread size"
2013-09-14 00:00:33 +00:00
Brian Carlstrom
50af69e8f3
Simplify main thread stack size initialization
...
Change-Id: Iec09433d9de501031cce09dc75848a5e8f3d96bf
2013-09-13 16:44:47 -07:00
Brian Carlstrom
322e7bce23
Use kernel default for initial thread size
...
Bug: 10697851
Change-Id: I8d980f5e0b584799536f6e6b891056c968d26cdf
2013-09-13 16:25:25 -07:00
Brian Carlstrom
0890436da9
am 9a74e36f
: Use kernel default for initial thread size
...
* commit '9a74e36f4810ca22cb12f8eafe4f929edfa57e58':
Use kernel default for initial thread size
2013-09-13 13:20:19 -07:00
Elliott Hughes
e0d1d4cf49
am 6ebc24fc
: am d3f9e815
: resolved conflicts for merge of 5d0ad38c
to jb-mr2-dev
...
* commit '6ebc24fcc3cf07f1be936ef9d7a8c3afff1861c7':
Upgrade pre-jb-mr2 releases to tzdata2013d.
2013-09-13 11:50:20 -07:00
Elliott Hughes
6ebc24fcc3
am d3f9e815
: resolved conflicts for merge of 5d0ad38c
to jb-mr2-dev
...
* commit 'd3f9e8155bfc17b2d67d2ffe5bc1d3a5e2656cd4':
Upgrade pre-jb-mr2 releases to tzdata2013d.
2013-09-13 11:46:09 -07:00
Elliott Hughes
d3f9e8155b
resolved conflicts for merge of 5d0ad38c
to jb-mr2-dev
...
Change-Id: I606f6d86aad46c5eda0dc0d907fe691ca0eea826
2013-09-13 11:16:11 -07:00
Elliott Hughes
5d0ad38c72
resolved conflicts for merge of ca2c6f75
to jb-mr1-dev-plus-aosp
...
Change-Id: If84f3c832a21ca1adf1a8009f50aa4a10f42a57e
2013-09-13 11:09:46 -07:00
Elliott Hughes
ca2c6f75a8
am 592c0708
: am b30f6eb0
: am 9e6104d5
: resolved conflicts for merge of 05292dd6
to jb-mr1-dev
...
* commit '592c07084bf0d86b42e216002e5aaabf40023ea8':
Upgrade pre-jb-mr2 releases to tzdata2013d.
2013-09-13 10:56:39 -07:00
Elliott Hughes
592c07084b
am b30f6eb0
: am 9e6104d5
: resolved conflicts for merge of 05292dd6
to jb-mr1-dev
...
* commit 'b30f6eb026db05c969afacc758e529e73f0e314d':
Upgrade pre-jb-mr2 releases to tzdata2013d.
2013-09-13 10:53:43 -07:00
Elliott Hughes
b30f6eb026
am 9e6104d5
: resolved conflicts for merge of 05292dd6
to jb-mr1-dev
...
* commit '9e6104d54f541d43d3c1b785f2dfc1d2e09c0f2f':
Upgrade pre-jb-mr2 releases to tzdata2013d.
2013-09-13 10:51:31 -07:00
Elliott Hughes
9e6104d54f
resolved conflicts for merge of 05292dd6
to jb-mr1-dev
...
Change-Id: I051cad5dc3c985f11c52708f4487e64ea45ca617
2013-09-13 10:17:10 -07:00
Elliott Hughes
05292dd65b
resolved conflicts for merge of cc7f0dc5
to jb-dev-plus-aosp
...
Change-Id: I812d0007ddd1576583a4749461b57ee33fb1eb15
2013-09-13 10:09:56 -07:00
Elliott Hughes
cc7f0dc5a1
Upgrade pre-jb-mr2 releases to tzdata2013d.
...
From the release notes:
Changes affecting future time stamps:
Morocco's midsummer transitions this year are July 7 and August 10,
not July 9 and August 8. (Thanks to Andrew Paprocki.)
Israel now falls back on the last Sunday of October.
(Thanks to Ephraim Silverberg.)
Changes affecting past time stamps:
Specify Jerusalem's location more precisely; this changes the pre-1880
times by 2 s.
Changing affecting metadata only:
Fix typos in the entries for country codes BQ and SX.
Change-Id: I8caa139f0eecbe038643df43a27088278c6185cd
2013-09-13 09:43:15 -07:00
Brian Carlstrom
9a74e36f48
Use kernel default for initial thread size
...
Bug: 10697851
Change-Id: I8d980f5e0b584799536f6e6b891056c968d26cdf
2013-09-12 22:19:44 -07:00
Christopher Ferris
2e7a8b44c2
resolved conflicts for merge of 883ef249
to klp-dev-plus-aosp
...
Change-Id: I1e2bd03a0cb5a0ab191c525d1574377bc7fd90ab
2013-09-10 19:49:04 -07:00
Christopher Ferris
883ef2499c
__memcpy_chk: Fix signed cmp of unsigned values.
...
I accidentally did a signed comparison of the size_t values passed in
for three of the _chk functions. Changing them to unsigned compares.
Add three new tests to verify this failure is fixed.
Bug: 10691831
Change-Id: Ia831071f7dffd5972a748d888dd506c7cc7ddba3
2013-09-10 17:34:03 -07:00
Christopher Ferris
5cb0436930
am 1a88ca08
: am 98c726ec
: Merge "Add the dl_iterate_phdr function to libdl for arm."
...
* commit '1a88ca08046ea510bfc8d3de6875537f124b3ce3':
Add the dl_iterate_phdr function to libdl for arm.
2013-09-06 10:57:40 -07:00
Christopher Ferris
1a88ca0804
am 98c726ec
: Merge "Add the dl_iterate_phdr function to libdl for arm."
...
* commit '98c726ec9b40e75efdd3ea027cd9cc627329f85e':
Add the dl_iterate_phdr function to libdl for arm.
2013-09-06 10:54:56 -07:00
Christopher Ferris
98c726ec9b
Merge "Add the dl_iterate_phdr function to libdl for arm."
2013-09-06 17:52:35 +00:00
Christopher Ferris
24053a461e
Add the dl_iterate_phdr function to libdl for arm.
...
Bug: 8410085
Merge from internal master.
(cherry-picked from cb491bc66d
)
Change-Id: I94ed51bc5d4c626df7552c0e85c31ccee2d6568f
2013-09-06 09:53:54 -07:00
Elliott Hughes
a015800e73
am 5d094c40
: am df7436e7
: Merge "Avoid segfaults if properties are not initialized"
...
* commit '5d094c408841370e4a6f2846ae3408d2e6d12f94':
Avoid segfaults if properties are not initialized
2013-09-03 14:12:31 -07:00
Elliott Hughes
5d094c4088
am df7436e7
: Merge "Avoid segfaults if properties are not initialized"
...
* commit 'df7436e709035fb6f5667980042848c8b4ca3e79':
Avoid segfaults if properties are not initialized
2013-09-03 14:09:08 -07:00
Elliott Hughes
df7436e709
Merge "Avoid segfaults if properties are not initialized"
2013-09-03 21:07:16 +00:00
Elliott Hughes
eb31e1c558
am 1e96d49a
: am afa31042
: Merge "Fix strchr for basic non-sse case on x86"
...
* commit '1e96d49a7d4d1af8f3bd6630e4ec9369813f18e7':
Fix strchr for basic non-sse case on x86
2013-09-03 14:07:11 -07:00
Elliott Hughes
1e96d49a7d
am afa31042
: Merge "Fix strchr for basic non-sse case on x86"
...
* commit 'afa310427e04f067976e5b979e2cceb3d759bf3f':
Fix strchr for basic non-sse case on x86
2013-09-03 14:05:51 -07:00
Elliott Hughes
afa310427e
Merge "Fix strchr for basic non-sse case on x86"
2013-09-03 21:03:39 +00:00
Pavel Chupin
3c4b50fd8c
Fix strchr for basic non-sse case on x86
...
Fix source location. Move declaration of __strchr_chk out of
ifdef __BIONIC_FORTIFY which should be available for strchr.cpp
compilation when __BIONIC_FORTIFY is not defined.
Change-Id: I552a6e16656e59b276b322886cfbf57bbfb2e6a7
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2013-09-03 16:20:52 +04:00
Pavel Chupin
a21e696d90
Avoid segfaults if properties are not initialized
...
Null or constant dereferencing occurs if properties are not initialized.
On Android devices it shouldn't happen but can be faced if testing bionic
libc.so on Linux host.
Change-Id: I8f047cbe17d0e7bcde40ace000a8aa53789c16cb
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2013-09-03 13:27:09 +04:00
Christopher Ferris
153ec2a76f
am 49c0d471
: Merge "Fix all debug directives." into klp-dev
...
* commit '49c0d471a8ba9ed32e7fdadb7e4ea6118b4b4af4':
Fix all debug directives.
2013-08-29 14:23:06 -07:00
Christopher Ferris
49c0d471a8
Merge "Fix all debug directives." into klp-dev
2013-08-29 21:21:20 +00:00
Christopher Ferris
7a80982913
am fc24bc25
: am 99b859cf
: Merge "Move stack unwinding test into library."
...
* commit 'fc24bc2544edad03798a1c69d6a76259e6f1e7dd':
Move stack unwinding test into library.
2013-08-29 14:18:41 -07:00
Christopher Ferris
fc24bc2544
am 99b859cf
: Merge "Move stack unwinding test into library."
...
* commit '99b859cf786f208300f7fc3a6fa5b570c3333433':
Move stack unwinding test into library.
2013-08-29 14:16:18 -07:00
Christopher Ferris
99b859cf78
Merge "Move stack unwinding test into library."
2013-08-29 21:13:22 +00:00
Christopher Ferris
8240bed918
Move stack unwinding test into library.
...
Bug: 8291716
Change-Id: Ia270f074b574a8fe86b5ad435bdef80999c64295
2013-08-29 14:00:25 -07:00
Christopher Ferris
05332f2ce7
Fix all debug directives.
...
The backtrace when a fortify check failed was not correct. This change
adds all of the necessary directives to get a correct backtrace.
Fix the strcmp directives and change all labels to local labels.
Testing:
- Verify that the runtime can decode the stack for __memcpy_chk, __memset_chk,
__strcpy_chk, __strcat_chk fortify failures.
- Verify that gdb can decode the stack properly when hitting a fortify check.
- Verify that the runtime can decode the stack for a seg fault for all of the
_chk functions and for memcpy/memset.
- Verify that gdb can decode the stack for a seg fault for all of the _chk
functions and for memcpy/memset.
- Verify that the runtime can decode the stack for a seg fault for strcmp.
- Verify that gdb can decode the stack for a seg fault in strcmp.
Bug: 10342460
Bug: 10345269
Change-Id: I1dedadfee207dce4a285e17a21e8952bbc63786a
2013-08-28 15:42:05 -07:00
Nick Kralevich
4d0fbf9b07
am 89dcc10c
: am 4e3ed44d
: Merge "cdefs.h: introduce __bos0"
...
* commit '89dcc10c320c032faef83c4940a57949ade01dba':
cdefs.h: introduce __bos0
2013-08-28 14:36:50 -07:00
Nick Kralevich
89dcc10c32
am 4e3ed44d
: Merge "cdefs.h: introduce __bos0"
...
* commit '4e3ed44db1200ca810842b0667e7fc80125de28d':
cdefs.h: introduce __bos0
2013-08-28 14:33:59 -07:00
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
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