Josh Gao
9e3d873036
am 823cff84: Merge changes I81408ef0,Id0eb8d06
...
* commit '823cff847b3b202b235ddd84650338f07bc61511':
Implement setjmp cookies on AArch64.
Implement setjmp cookies on ARM.
2015-09-17 21:15:57 +00:00
Josh Gao
7fda8d2aa4
Implement setjmp cookies on ARM.
...
Reuse the top bits of _JB_SIGFLAG field previously used to store a
boolean to store a cookie that's validated by [sig]longjmp to make it
harder to use as a ROP gadget. Additionally, encrypt saved registers
with the cookie so that an attacker can't modify a register's value to
a specific value without knowing the cookie.
Bug: http://b/23942752
Change-Id: Id0eb8d06916e89d5d776bfcaa9458f8826717ba3
2015-09-17 14:07:24 -07:00
Yabin Cui
72e678c8a7
am cbd0a15b: Merge "Fix the way to get main thread stack start address."
...
* commit 'cbd0a15be881abb8ce1feb5b389da2f517a9a4c6':
Fix the way to get main thread stack start address.
2015-09-17 02:42:52 +00:00
Mor-sarid, Nitzan
569333293a
Fix the way to get main thread stack start address.
...
For previous way to get the stack using the [stack] string from
/proc/self/task/<pid>/maps is not enough. On x86/x86_64, if an
alternative signal stack is used while a task switch happens,
the [stack] indicator may no longer be correct.
Instead, stack_start from /proc/self/stat which is always inside
the main stack, is used to find the main stack in /proc/self/maps.
Change-Id: Ieb010e71518b57560d541cd3b3563e5aa9660750
Signed-off-by: Nitzan Mor-sarid <nitzan.mor-sarid@intel.com>
Signed-off-by: Mingwei Shi <mingwei.shi@intel.com>
2015-09-16 11:45:13 -07:00
Elliott Hughes
edc73f6286
am ba9c1705: Merge "linker: don\'t pass dlextinfo to dependent loads"
...
* commit 'ba9c17053456aed4452a349cf45c5960d9231f25':
linker: don't pass dlextinfo to dependent loads
2015-09-04 18:12:33 +00:00
Dmitriy Ivanov
edfc9f63a2
linker: don't pass dlextinfo to dependent loads
...
Don't pass the parent load's dlextinfo to dependent loads, since this
causes the linker to try to load the dependencies using the same
addresses/relro/fds/etc as the main library, which is never going to
work. This was how it worked before ae69a95 which broke this.
Bug: http://b/23742664
Bug: http://b/20948231
Bug: http://b/20841817
Change-Id: I340ebae1127666d5c6c6f9c6521b89fb93f15bdd
2015-09-02 16:32:02 -07:00
Yabin Cui
d3c7f67aed
am 32c85daa: Merge "build bionic gtest runner on mac."
...
* commit '32c85daa1570e589ce953c42b40fb34cf2b5e989':
build bionic gtest runner on mac.
2015-09-01 23:08:34 +00:00
Yabin Cui
767fb1c5c6
build bionic gtest runner on mac.
...
Change-Id: I39a7e94b6662256646dfaeb8f9ecd5c03cd5fbc6
2015-09-01 15:40:38 -07:00
Elliott Hughes
b57e9efd40
am c2e634dd: Merge "Fix regoff_t for LP32 and _FILE_OFFSET_BITS=64."
...
* commit 'c2e634dd303a44b11e30ab31e39ffc4eae5467f8':
Fix regoff_t for LP32 and _FILE_OFFSET_BITS=64.
2015-08-27 23:24:33 +00:00
Elliott Hughes
adf5c7237d
Fix regoff_t for LP32 and _FILE_OFFSET_BITS=64.
...
bionic is built without _FILE_OFFSET_BITS=64, so internally regoff_t
was 32-bit on LP32, but code compiled with _FILE_OFFSET_BITS would
expect rm_so and rm_eo in struct regmatch_t to be 64-bit, leading to
confusion.
Bug: http://b/23566443
Change-Id: Iae92fa545104068e4f64ce1977f5ec616859638c
2015-08-27 14:48:32 -07:00
Chih-hung Hsieh
e7a09ff7d9
am bfaee4bd: Merge "Add test cases for __emutls_get_address."
...
* commit 'bfaee4bd6ad901a699df21fd44d95f34e2e7444d':
Add test cases for __emutls_get_address.
2015-08-27 05:22:56 +00:00
Elliott Hughes
c6effb3af6
am 848808c6: Merge "Add preadv/pwritev."
...
* commit '848808c660ec4811f4ff5a2748b6f754b008cd21':
Add preadv/pwritev.
2015-08-27 05:22:55 +00:00
Chih-hung Hsieh
bfaee4bd6a
Merge "Add test cases for __emutls_get_address."
2015-08-26 22:27:35 +00:00
Elliott Hughes
6f4594d5dc
Add preadv/pwritev.
...
Bug: http://b/12612572
Change-Id: I38ff2684d69bd0fe3f21b1d371b88fa60d5421cb
2015-08-26 14:48:55 -07:00
Chih-Hung Hsieh
83380b5cf0
Add test cases for __emutls_get_address.
...
BUG: 22984770
Change-Id: I193c3612190260a08f3b3ad8b856c0ae8f94e03d
2015-08-26 13:10:14 -07:00
Elliott Hughes
03deb8287b
am 629ed517: Merge "Add strchrnul."
...
* commit '629ed517126b3be32f2b2e8b710e63358691c296':
Add strchrnul.
2015-08-26 18:42:45 +00:00
Elliott Hughes
7ac3c128bb
Add strchrnul.
...
Bug: http://b/18374026
Change-Id: Iea923309c090a51a2d41c5a83320ab3789f40f1c
2015-08-26 09:59:29 -07:00
Yabin Cui
6524806951
am 62c26ed9: Merge "add fortified implementations of write/pwrite{,64}"
...
* commit '62c26ed93e76ca9b3dd265f41eb3685ed2e72808':
add fortified implementations of write/pwrite{,64}
2015-08-21 03:17:34 +00:00
Yabin Cui
62c26ed93e
Merge "add fortified implementations of write/pwrite{,64}"
2015-08-21 03:03:22 +00:00
Daniel Micay
afdd15456a
add fortified implementations of write/pwrite{,64}
...
These are just based on the read/pread{,64} implementations with the
function calls and error messages adjusted as appropriate. The only
difference is that the buffer parameters are const.
Change-Id: Ida1597a903807f583f230d74bcedffdb7b24fcf6
2015-08-20 13:46:51 -04:00
Yabin Cui
2bcb25c1c3
am 0660be89: am a6a12a78: am 0fdcdd00: Merge "Fix flaky test time.timer_settime_0." into lollipop-mr1-cts-dev
...
* commit '0660be899f2d907dedbcb643315b73e652ec9510':
Fix flaky test time.timer_settime_0.
2015-08-11 19:10:33 +00:00
Yabin Cui
0660be899f
am a6a12a78: am 0fdcdd00: Merge "Fix flaky test time.timer_settime_0." into lollipop-mr1-cts-dev
...
* commit 'a6a12a7804402273e193074a58162cc0b3890812':
Fix flaky test time.timer_settime_0.
2015-08-11 19:05:43 +00:00
Yabin Cui
a6a12a7804
am 0fdcdd00: Merge "Fix flaky test time.timer_settime_0." into lollipop-mr1-cts-dev
...
* commit '0fdcdd0067af88e7deef73070d0861ceb9f53c37':
Fix flaky test time.timer_settime_0.
2015-08-11 18:56:43 +00:00
Yabin Cui
bf572d91b5
Fix flaky test time.timer_settime_0.
...
It fixes the problem reported in https://code.google.com/p/android/issues/detail?id=182395 .
Change-Id: Ie16aa04095dac08a62dd0d4c50e763b36526624c
2015-08-11 11:25:02 -07:00
Dan Albert
ee8576d114
am a3c01467: Merge "Move up to C++14."
...
* commit 'a3c01467ecf31cab1410ce7b8554e2e77dae3309':
Move up to C++14.
2015-08-11 00:00:14 +00:00
Dan Albert
5341691955
Move up to C++14.
...
The default standard version is now ahead of us. Stop specifying C++11
so we get that too.
Change-Id: Ic96942cd7fd134118e29b744601b0119e49b6ac4
2015-08-10 16:40:06 -07:00
Yabin Cui
c23143a5fd
am ff4afc13: Merge "Omit comment when reading --gtest_list_tests option\'s output."
...
* commit 'ff4afc136ef5d00d33a611e7bc1950249db9fbcf':
Omit comment when reading --gtest_list_tests option's output.
2015-08-10 22:22:04 +00:00
Yabin Cui
ff4afc136e
Merge "Omit comment when reading --gtest_list_tests option's output."
2015-08-10 22:01:07 +00:00
Elliott Hughes
23e0bdf7d4
am 182b91f6: Merge "Invalidate cached pid in vfork."
...
* commit '182b91f62809b03870f561a88135f5453966fe41':
Invalidate cached pid in vfork.
2015-08-10 20:08:09 +00:00
Yabin Cui
bf830ade7f
Omit comment when reading --gtest_list_tests option's output.
...
Gtest add comments when listing typed tests. And we should omit them.
Bug: 23040880
Change-Id: If6034af301337fc06eeab294d2dbe5317a6b7f91
2015-08-10 12:12:39 -07:00
Elliott Hughes
5891abdc66
Invalidate cached pid in vfork.
...
Bug: http://b/23008979
Change-Id: I1dd900ac988cdbe10aad3abc53240c5d352891d5
2015-08-07 19:44:12 -07:00
Yabin Cui
993a2bee84
am 7e919dae: Merge "add a fortified implementation of getcwd"
...
* commit '7e919daeaad62515ebbbf7b06badc77625a14d90':
add a fortified implementation of getcwd
2015-08-01 05:25:13 +00:00
Daniel Micay
9101b00400
add a fortified implementation of getcwd
...
Change-Id: Ice3e6d3e1ff07788305dc85f8ee4059baad5fac4
2015-08-01 00:42:30 -04:00
Elliott Hughes
9d7c6a7e57
am 61c21b63: Merge "Revert "add a fortified implementation of getcwd""
...
* commit '61c21b63bc1602bce8685757fb1c2a788cc9eb8d':
Revert "add a fortified implementation of getcwd"
2015-07-31 17:41:05 +00:00
Elliott Hughes
4c43aac9a5
Revert "add a fortified implementation of getcwd"
...
This reverts commit 89a121d43a274131cf9f84b0e685bebf1e70cc1b.
Change-Id: Ib6f6fd424acea68a063777e9f324405450e23316
2015-07-31 17:32:50 +00:00
Yabin Cui
4279bac26a
am 442a3fca: Merge "add a fortified implementation of getcwd"
...
* commit '442a3fcae68152a95ef481ef99932d1bc001dc08':
add a fortified implementation of getcwd
2015-07-31 17:11:27 +00:00
Daniel Micay
89a121d43a
add a fortified implementation of getcwd
...
Change-Id: I95001ae4fe8f206db83e5c44d129ba11310695ce
2015-07-30 17:16:40 -04:00
Elliott Hughes
c9bee10805
am 4955cde2: Merge "Add a regression test for a fixed strnlen bug."
...
* commit '4955cde2c55d4860f12039a96d14fc756b1308a3':
Add a regression test for a fixed strnlen bug.
2015-07-28 15:30:24 +00:00
Elliott Hughes
d2a9fb3267
Add a regression test for a fixed strnlen bug.
...
Bug: https://code.google.com/p/android/issues/detail?id=74741
Change-Id: I78b0114bdbe8e680b0e938af608a634e73c86eda
2015-07-27 20:55:03 -07:00
Chih-hung Hsieh
c11758f2c9
am cebef1a7: Merge "Add one simple thread local storage test."
...
* commit 'cebef1a7812fe3552f12dd7e885a1f879a9946ed':
Add one simple thread local storage test.
2015-07-28 02:01:16 +00:00
Chih-hung Hsieh
cebef1a781
Merge "Add one simple thread local storage test."
2015-07-28 01:33:01 +00:00
Chih-Hung Hsieh
7656d0cec0
Add one simple thread local storage test.
...
This test should pass with gcc and fail with clang,
until clang/llvm supports emutls or Android linker supports
ELF TLS models.
BUG: 21082792
Change-Id: Id8c97da52c68ec230c7d26af703f6ed32d53a4fe
2015-07-27 17:20:19 -07:00
Yabin Cui
0e63c39cca
am 8af32633: Merge "add fortified implementations of fread/fwrite"
...
* commit '8af32633498184e58e6f8d5d75b9f9cdbef5b6be':
add fortified implementations of fread/fwrite
2015-07-28 00:17:08 +00:00
Yabin Cui
8af3263349
Merge "add fortified implementations of fread/fwrite"
2015-07-27 22:46:29 +00:00
Elliott Hughes
7835c65ca7
am adc5795f: Merge "Use AT_PAGESZ for sysconf(_SC_PAGE_SIZE)."
...
* commit 'adc5795fb7b674e6d40d1f190c675607c1379343':
Use AT_PAGESZ for sysconf(_SC_PAGE_SIZE).
2015-07-25 18:58:57 +00:00
Elliott Hughes
189394b885
Use AT_PAGESZ for sysconf(_SC_PAGE_SIZE).
...
Bug: http://b/18342333
Change-Id: Id12ed4e85a0f35d7d27202f7792df42a65a74b4e
2015-07-24 23:22:07 -07:00
Daniel Micay
fed2659869
add fortified implementations of fread/fwrite
...
A __size_mul_overflow utility is used to take advantage of the checked
overflow intrinsics in Clang and GCC (>= 5). The fallback for older
compilers is the optimized but less than ideal overflow checking pattern
used in OpenBSD.
Change-Id: Ibb0d4fd9b5acb67983e6a9f46844c2fd444f7e69
2015-07-23 18:55:46 -04:00
Yabin Cui
c0c9704e11
am 2565492d: Merge "Add getgrgid_r/getgrnam_r."
...
* commit '2565492db0d67b95348cd1c3026ed338ca59aa37':
Add getgrgid_r/getgrnam_r.
2015-07-23 02:06:56 +00:00
Yabin Cui
2565492db0
Merge "Add getgrgid_r/getgrnam_r."
2015-07-22 03:22:26 +00:00
Yabin Cui
c4786d366b
Add getgrgid_r/getgrnam_r.
...
Bug: 22568551
Change-Id: I3c0772d119d6041063c6be53f5bcc5ea1768f0d5
2015-07-21 19:33:34 -07:00