tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
36873 commits 1 branch 0 tags 80 MiB
Commit graph

36873 commits

This branch
This branch
All branches
Author SHA1 Message Date
Florian Mayer
7fef14b499 Merge "Fix missing null-terminator to exec call." am: 7587e20eaf am: bbe7c690f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/18171741

Change-Id: Iac611e0d8fa534750aed246e1fc009915afcb8d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 23:00:51 +00:00
Florian Mayer
bbe7c690f1 Merge "Fix missing null-terminator to exec call." am: 7587e20eaf 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2073947

Change-Id: Id15a4a4e86f6bb05378ec1f775fb07693bd9fbda
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
(cherry picked from commit 0f46547800)
 2022-05-04 21:00:22 +00:00
Elliott Hughes
dfed744739 [automerger skipped] seccomp: allow stat() for ubsan. am: 22dfc589ee -s ours 
am skip reason: Merged-In Id42cb29c4e943c0080c0d34ce4e5d6d1b32da9e8 with SHA-1 a0745cea5f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/18167201

Change-Id: I7ce779c661bff2d17dc0e29282d6435190c02a0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 19:53:30 +00:00
Elliott Hughes
6e921fb0f6 Merge "seccomp: allow stat() for ubsan." am: 082b9290d0 am: f231c79c8f 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2081859

Change-Id: Iabe74db3b02665ddb16bbd2e9cfa35bc4f3b97bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:54:27 +00:00
Elliott Hughes
f231c79c8f Merge "seccomp: allow stat() for ubsan." am: 082b9290d0 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2081859

Change-Id: I5d5e07f4607673ea565db1454c9c58ed3529b55f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:09:09 +00:00
Elliott Hughes
22dfc589ee seccomp: allow stat() for ubsan. 
We've had complaints about ubsan issues for years, but never got to the
bottom of them, or saw them ourselves in testing. For some reason (still
not understood) we've started to see this ourselves in T and downstream
branches. So for now, let's just punch that extra hole.

Longer term, ubsan should stop needing any of this, so once
https://reviews.llvm.org/D124212 is in an LTS NDK, we should be able to
get rid of this _and_ the existing sanitizer-related holes.

Bug: https://github.com/android/ndk/issues/1298
Bug: http://b/229989971
Test: treehugger
Change-Id: Id42cb29c4e943c0080c0d34ce4e5d6d1b32da9e8
(cherry picked from commit a0745cea5f)
Merged-In: Id42cb29c4e943c0080c0d34ce4e5d6d1b32da9e8
 2022-05-04 16:37:12 +00:00
Elliott Hughes
082b9290d0 Merge "seccomp: allow stat() for ubsan." 2022-05-04 16:35:26 +00:00
Treehugger Robot
a42a68798b Merge "Properly fix heap_tagging_helper for HWASan." am: 0f6d493d28 am: 08b0b29b7e 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2083905

Change-Id: I98bf00c8d3edc4c75fb983e9318937b99a9ed086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 06:25:34 +00:00
Treehugger Robot
08b0b29b7e Merge "Properly fix heap_tagging_helper for HWASan." am: 0f6d493d28 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2083905

Change-Id: I851c7f6a7893b1906bb0791892c33d1a2a29d793
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-03 05:58:48 +00:00
Treehugger Robot
0f6d493d28 Merge "Properly fix heap_tagging_helper for HWASan." 2022-05-03 05:34:16 +00:00
Maciej Żenczykowski
189de146e9 Merge "allowlist new Linux close_range() system call, use it in posix_spawn()" am: 668c061986 am: e65715094f 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2072627

Change-Id: I098d7327085618b4963bf922af3bce4bfe288a2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 22:09:09 +00:00
Maciej Żenczykowski
e65715094f Merge "allowlist new Linux close_range() system call, use it in posix_spawn()" am: 668c061986 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2072627

Change-Id: Ib2eacfc5e3bd1a455a83777cebf99e1ecf3ed2fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-02 21:31:06 +00:00
Florian Mayer
e2d50fe622 Properly fix heap_tagging_helper for HWASan. 
Test: atest bionic-unit-tests
Change-Id: Ia9fbb436676257810d1c379d5d65dd7ccfcf90ac
 2022-05-02 18:35:50 +00:00
Maciej Żenczykowski
47f532a00d allowlist new Linux close_range() system call, use it in posix_spawn() am: 436980d31c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/18092494

Change-Id: If74d964cbf9e6be6c9d285fed43743c564e870b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:41:23 +00:00
Elliott Hughes
a0745cea5f seccomp: allow stat() for ubsan. 
We've had complaints about ubsan issues for years, but never got to the
bottom of them, or saw them ourselves in testing. For some reason (still
not understood) we've started to see this ourselves in T and downstream
branches. So for now, let's just punch that extra hole.

Longer term, ubsan should stop needing any of this, so once
https://reviews.llvm.org/D124212 is in an LTS NDK, we should be able to
get rid of this _and_ the existing sanitizer-related holes.

Bug: https://github.com/android/ndk/issues/1298
Bug: http://b/229989971
Test: treehugger
Change-Id: Id42cb29c4e943c0080c0d34ce4e5d6d1b32da9e8
 2022-04-29 15:48:08 -07:00
Maciej Żenczykowski
436980d31c allowlist new Linux close_range() system call, use it in posix_spawn() 
Linux kernel's close_range() system call (currently) allows:
  close() unshare() fcntl(F_SETFD, FD_CLOEXEC)
to be performed on ranges of fds.

All 3 of these are already allowed by seccomp bpf:
as such this doesn't allow you to do anything you can't already do.

We can't add close_range() properly to bionic because we'd need to
fiddle about with ltp and it's too late to add new T API anyway,
so let's just make the direct syscall() call.

We'll add proper support in U.

See also:
  https://man7.org/linux/man-pages/man2/close_range.2.html

Test: TreeHugger
Bug: 229913920
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I85586d544fc23bed6aee59f00bdb79ee7a8150d1
Merged-In: I85586d544fc23bed6aee59f00bdb79ee7a8150d1
 2022-04-29 13:42:50 -07:00
Maciej Żenczykowski
668c061986 Merge "allowlist new Linux close_range() system call, use it in posix_spawn()" 2022-04-29 07:07:16 +00:00
Maciej Żenczykowski
c9c0ebde3c allowlist new Linux close_range() system call, use it in posix_spawn() 
Linux kernel's close_range() system call (currently) allows:
  close() unshare() fcntl(F_SETFD, FD_CLOEXEC)
to be performed on ranges of fds.

All 3 of these are already allowed by seccomp bpf:
as such this doesn't allow you to do anything you can't already do.

We can't add close_range() properly to bionic because we'd need to
fiddle about with ltp and it's too late to add new T API anyway,
so let's just make the direct syscall() call.

We'll add proper support in U.

See also:
  https://man7.org/linux/man-pages/man2/close_range.2.html

Test: TreeHugger
Bug: 229913920
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I85586d544fc23bed6aee59f00bdb79ee7a8150d1
 2022-04-28 23:33:38 +00:00
Automerger Merge Worker
f6d3af63d5 Merge "Merge "Merge "Fix unistd.exec_argv0_null for new kernels." into android12-tests-dev am: b4cee37d7d" into android12L-tests-dev am: eec0b88f15" am: 966a778a24 am: 8534a71752 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2078360

Change-Id: I66e80171c4263d3f036a3bfadf9b8437632ed8eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 23:14:39 +00:00
Treehugger Robot
96eaf7ff16 Merge "Improve the "how to add a system call" documentation." am: 069a25fe57 am: 127dc13b42 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2072701

Change-Id: I029d0b0a590327db61af812040c1e6c71358e32a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 23:14:21 +00:00
Automerger Merge Worker
8534a71752 Merge "Merge "Merge "Fix unistd.exec_argv0_null for new kernels." into android12-tests-dev am: b4cee37d7d" into android12L-tests-dev am: eec0b88f15" am: 966a778a24 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2078360

Change-Id: I9573e57d69a456d1f0b1ffd3575c657bc6c42515
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 22:07:29 +00:00
Treehugger Robot
127dc13b42 Merge "Improve the "how to add a system call" documentation." am: 069a25fe57 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2072701

Change-Id: I27381f3f30507e1d98f32eb92eae74acec959267
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 22:07:19 +00:00
Automerger Merge Worker
966a778a24 Merge "Merge "Merge "Fix unistd.exec_argv0_null for new kernels." into android12-tests-dev am: b4cee37d7d" into android12L-tests-dev am: eec0b88f15" 2022-04-27 21:44:05 +00:00
Automerger Merge Worker
994ccab13e Merge "Merge "Fix unistd.exec_argv0_null for new kernels." into android12-tests-dev am: b4cee37d7d" into android12L-tests-dev am: eec0b88f15 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2078360

Change-Id: I763aa2e4672e54a4fe3df9517b3935740653237e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 21:44:02 +00:00
Treehugger Robot
069a25fe57 Merge "Improve the "how to add a system call" documentation." 2022-04-27 21:40:34 +00:00
Automerger Merge Worker
eec0b88f15 Merge "Merge "Fix unistd.exec_argv0_null for new kernels." into android12-tests-dev am: b4cee37d7d" into android12L-tests-dev 2022-04-27 21:26:56 +00:00
Treehugger Robot
7f7994cd16 Merge "Fix unistd.exec_argv0_null for new kernels." into android12-tests-dev am: b4cee37d7d 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2078360

Change-Id: Ia864567dea05116f0b92edd31f5645edbc82e483
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 21:26:53 +00:00
Treehugger Robot
b4cee37d7d Merge "Fix unistd.exec_argv0_null for new kernels." into android12-tests-dev 2022-04-27 21:07:54 +00:00
Automerger Merge Worker
df130f41ef Merge "Merge "Merge "Merge "Fix unistd.exec_argv0_null for new kernels." into android11-tests-dev am: 9d0912a7b2" into android12-tests-dev am: f14019cf61" into android12L-tests-dev am: dc8f5f7d3a" am: 83e70ab7f3 am: f75e0b52f9 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2078359

Change-Id: Ic1ca9d6618e6f66a9d94054c62b8e23f4f5aa662
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:29:55 +00:00
Automerger Merge Worker
73857c1c2e Merge "Merge "Merge "Merge "Merge "Fix unistd.exec_argv0_null for new kernels." into android10-tests-dev am: 16457fd9d0" into android11-tests-dev am: ede618aef2" into android12-tests-dev am: ba0f5b9195" into android12L-tests-dev am: 19dce61545" am: 112a717077 am: d925a75276 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2078358

Change-Id: I79d2f34edc0934b0a4d5aa9bcc50d4cb85f6d1e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:29:46 +00:00
Automerger Merge Worker
6234f22003 Merge "Merge "Merge "Regression test for scudo crash in resizeTaggedChunk." into android12-tests-dev am: d8fa0f64af" into android12L-tests-dev am: 6c73a7ac6f" am: 3e8dfcebfb am: 7d341ef7a0 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1901121

Change-Id: I24aea21759b37c493d61a782f5a12af48b89c20a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:29:34 +00:00
Automerger Merge Worker
51ffbcc674 Merge "Merge "Merge "Skip the malloc_slack test on native bridge." into android12-tests-dev am: 1623704319" into android12L-tests-dev am: 9ca3b55cc1" am: cf1733aceb am: 2eaf109a4c 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1854022

Change-Id: I63c3ec89ac5feea13fb5f1a19f1b9cad22b6ddd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:29:25 +00:00
Automerger Merge Worker
7e0ce073cf Merge "Merge "Merge "Merge "Merge "Fix possible issue with cfi_basic test." into android10-tests-dev am: 3144bf7b69" into android11-tests-dev am: 9ef57feced" into android12-tests-dev am: 05f451ff40" into android12L-tests-dev am: 68fd586b3a" am: a7e8b92de6 am: 5847b6fc70 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1450415

Change-Id: I139bf32c180bb0e41a675a4bd153efe15d74ad82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:29:16 +00:00
Automerger Merge Worker
9cca2c8ea4 Merge changes from topic "am-492299fff56f41ea80d26768bcc5c005" am: 99eb475597 am: 26d979258e 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1371143

Change-Id: Ia7f0b75f4a40221cbabd0faf7ead7ad3ae8893fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:29:01 +00:00
Treehugger Robot
f4f5562670 [automerger skipped] Merge "Remove stack address check in cfi_basic test." into android10-tests-dev am: c9608ab2e2 -s ours am: 83dd5914ae -s ours am: f1f4c02d31 -s ours am: ef543c40bc -s ours am: 8560b4b39f -s ours am: cb0cf70f0d -s ours 
am skip reason: skipped by user eugenis

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1371143

Change-Id: I34e9cbc01b1381bd7a3b4a7f382b59a08b118088
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:29:00 +00:00
Automerger Merge Worker
960f6708b6 Merge changes from topic "am-c6b8230339e24a95948ea129db34cb0d" am: 3286b39941 am: cc0f9f3638 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1183110

Change-Id: I974de5a3b81c7d4744eaa58a8a11576f6904418f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:28:45 +00:00
Treehugger Robot
83661829e8 [automerger skipped] Merge "Fix linker path for emulated architecture" into android10-tests-dev am: ce45ee1184 -s ours am: 00653f6ae3 -s ours am: ebc90ae254 -s ours am: e1c9dbc5ba -s ours am: e36df1a6c0 -s ours am: 57ff9874da -s ours 
am skip reason: skipped by user levarum

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1183110

Change-Id: Iede15d85235b7abc409e6445fe3d4e82e0e47b9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:28:44 +00:00
Automerger Merge Worker
5a8e534aa8 Merge changes from topic "am-8820c465c51b44949f4e1a80b5097183" am: 9888c1aae5 am: 89eb482aee 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1164119

Change-Id: I0ce67cdbd27a441fa445ae63a41bdfab4c3cae85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:28:30 +00:00
Treehugger Robot
7875d50770 [automerger skipped] Merge "Fix Bionic dlfcn.dladdr_libc test case for 64bit binary translations" into android10-tests-dev am: 3382f346fc -s ours am: 7fad99971d -s ours am: b013f1698e -s ours am: ed828cfb2e -s ours am: 18bb0fce55 -s ours am: a9223360d2 -s ours 
am skip reason: skipped by user rossyeh

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1164119

Change-Id: Iae86e411ba3c7c9bb9a4f09b9ab818cd5c9152e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:28:29 +00:00
Automerger Merge Worker
761245a0ff Merge "Merge "Merge "Merge "Merge "Stop executing if skip occurs." into android10-tests-dev am: 1e4793561f" into android11-tests-dev am: 3596058918" into android12-tests-dev am: d55f2ce1ef" into android12L-tests-dev am: 45cb321127" am: 4f625b29dd am: 2d7dd618e7 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1126826

Change-Id: Ie6c7d7d4d6d914bce3f42a2b1994473dd8fd30bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:28:14 +00:00
Automerger Merge Worker
795765f920 Merge "Merge "Merge changes from topic "am-b2f669f2672c49a5b83a262bba261f9f" into android12-tests-dev am: d8a59345e1" into android12L-tests-dev am: 60d6cfe283" am: 92d7eeb156 am: baaf42c11b 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1466626

Change-Id: I3f83ed877d2eb005327f64cc7c53844edc16d00c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:28:03 +00:00
Automerger Merge Worker
ed482b1430 Merge changes from topic "am-091f415997b249b294c1df49d5087405" am: 303ab2c8b4 am: 6c95c7ed3c 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1431308

Change-Id: Idb3edff16a69015e05097c46206598e541d48ff3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:27:41 +00:00
Treehugger Robot
e389961f00 [automerger skipped] Merge changes I42a81210,I42ce2b5a,Id949c9e5 into android11-tests-dev am: 0d97015dbe -s ours am: 6c706660e9 -s ours am: 9778932c7f -s ours am: 5ac1e26c51 -s ours am: b84fb0ca2a -s ours 
am skip reason: skipped by user levarum

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1431308

Change-Id: I920f79a6e8a4a8d756a9d16c05e72cca6b811907
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:27:38 +00:00
Automerger Merge Worker
f75e0b52f9 Merge "Merge "Merge "Merge "Fix unistd.exec_argv0_null for new kernels." into android11-tests-dev am: 9d0912a7b2" into android12-tests-dev am: f14019cf61" into android12L-tests-dev am: dc8f5f7d3a" am: 83e70ab7f3 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2078359

Change-Id: I3a2609c33417459e66c1810a0279fe7efe377fa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:03:01 +00:00
Automerger Merge Worker
d925a75276 Merge "Merge "Merge "Merge "Merge "Fix unistd.exec_argv0_null for new kernels." into android10-tests-dev am: 16457fd9d0" into android11-tests-dev am: ede618aef2" into android12-tests-dev am: ba0f5b9195" into android12L-tests-dev am: 19dce61545" am: 112a717077 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2078358

Change-Id: Ic273d76bba7d5fe3f0a9714d848c94b589c783db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:02:49 +00:00
Automerger Merge Worker
7d341ef7a0 Merge "Merge "Merge "Regression test for scudo crash in resizeTaggedChunk." into android12-tests-dev am: d8fa0f64af" into android12L-tests-dev am: 6c73a7ac6f" am: 3e8dfcebfb 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1901121

Change-Id: I42f3e65303c85a39ffc10109b84a346de8032491
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:02:30 +00:00
Automerger Merge Worker
2eaf109a4c Merge "Merge "Merge "Skip the malloc_slack test on native bridge." into android12-tests-dev am: 1623704319" into android12L-tests-dev am: 9ca3b55cc1" am: cf1733aceb 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1854022

Change-Id: I48df9e16ba1205ed10c92d3562a2ceb90955e466
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:02:11 +00:00
Automerger Merge Worker
5847b6fc70 Merge "Merge "Merge "Merge "Merge "Fix possible issue with cfi_basic test." into android10-tests-dev am: 3144bf7b69" into android11-tests-dev am: 9ef57feced" into android12-tests-dev am: 05f451ff40" into android12L-tests-dev am: 68fd586b3a" am: a7e8b92de6 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1450415

Change-Id: I8c4969b5149c7ac643a7c06c149c45eaf69a037d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:01:49 +00:00
Automerger Merge Worker
26d979258e Merge changes from topic "am-492299fff56f41ea80d26768bcc5c005" am: 99eb475597 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1371143

Change-Id: Id04669120b7df2852215c92313f3774ba18ff57a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:01:25 +00:00
Treehugger Robot
cb0cf70f0d [automerger skipped] Merge "Remove stack address check in cfi_basic test." into android10-tests-dev am: c9608ab2e2 -s ours am: 83dd5914ae -s ours am: f1f4c02d31 -s ours am: ef543c40bc -s ours am: 8560b4b39f -s ours 
am skip reason: skipped by user eugenis

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1371143

Change-Id: Ia2a94268e0992bc8c161764af4293250ac450e77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 20:01:23 +00:00