Commit graph

36110 commits

Author SHA1 Message Date
Xin Li
13c6d8fcc0 Merge Android 12 QPR3 ab/8391262
Bug: 226662282
Merged-In: I5cf8a129f1bcdadabeae64169f64274243841700
Change-Id: I2a16e5ef0bb4be54c5e3565f6106b03de85e0f84
2022-04-01 20:31:48 +00:00
Treehugger Robot
f6b9048ec3 Merge "Extempt calculate_gnu_hash_neon from hwasan." am: 8581029d08
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2052349

Change-Id: I50d2151c24af784b77fbf765927d7d84fdc87da6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 01:20:27 +00:00
Treehugger Robot
8581029d08 Merge "Extempt calculate_gnu_hash_neon from hwasan." 2022-04-01 00:56:45 +00:00
Florian Mayer
6e8f3a76ee Extempt calculate_gnu_hash_neon from hwasan.
Bug: 227630703
Change-Id: I525c99796c87252050b46faffb3058f7e8b5866c
2022-03-31 22:46:54 +00:00
Elliott Hughes
eaa04f5da3 Merge "C11 removed gets()." am: 6bdefa6ca2 am: 2d2b6a18d9
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2050332

Change-Id: I5cf8a129f1bcdadabeae64169f64274243841700
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 17:09:24 +00:00
Elliott Hughes
2d2b6a18d9 Merge "C11 removed gets()." am: 6bdefa6ca2
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2050332

Change-Id: I91599ba17989e4c7e857aacb2436f861aa9c83de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 16:52:45 +00:00
Elliott Hughes
6bdefa6ca2 Merge "C11 removed gets()." 2022-03-31 16:30:43 +00:00
Elliott Hughes
1063039d19 C11 removed gets().
Test: treehugger
Change-Id: I793e29cbd52dd882b72eb58055cbc0dd05eb0f59
2022-03-30 17:25:10 -07:00
Ryan Prichard
f43a16923d Merge "Always process TLS relocs using general code path" am: df41909cf6 am: 0b2fdaacb5
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2043591

Change-Id: I13e1a78b7194f2ff7f175762e086aa2e951bb36b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 19:53:29 +00:00
Ryan Prichard
0b2fdaacb5 Merge "Always process TLS relocs using general code path" am: df41909cf6
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2043591

Change-Id: Iad266367292783e9b9fd988dd725e839099e2fda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 19:37:31 +00:00
Ryan Prichard
df41909cf6 Merge "Always process TLS relocs using general code path" 2022-03-28 19:19:12 +00:00
Ryan Prichard
8ea6af53e2 Always process TLS relocs using general code path
This is important for enabling the error about unsupported TLS
relocations to local symbols. The fast path tends to skip this error,
because it fails during lookup_symbol(). Add a test for this error.

I didn't see a performance regression in the linker_relocation
benchmark.

Bug: http://b/226978634
Test: m bionic-unit-tests
Change-Id: Ibef9bde2973cf8c2d420ecc9e8fe2c69a5097ce2
2022-03-25 15:51:11 -07:00
Mitch Phillips
dc3eebbc13 Merge "Add GWP-ASan CTS to bionic TEST_MAPPING" am: 98b49a060f am: b0a961ec00
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2043303

Change-Id: Ic538ebcd92527b32a777918242029537d26a0056
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 18:40:31 +00:00
Mitch Phillips
b0a961ec00 Merge "Add GWP-ASan CTS to bionic TEST_MAPPING" am: 98b49a060f
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2043303

Change-Id: Ibf3824aa177029632be8b9d3a870065bd1c0955d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 18:17:31 +00:00
Mitch Phillips
98b49a060f Merge "Add GWP-ASan CTS to bionic TEST_MAPPING" 2022-03-25 17:57:07 +00:00
Mitch Phillips
40d9622c12 Add GWP-ASan CTS to bionic TEST_MAPPING
Bug: N/A
Change-Id: Ia9aac40965ba77823cd3824b0508d4e48c07f43f
Test: presubmit should pick up the new test in TEST_MAPPING.
2022-03-25 00:08:32 +00:00
Treehugger Robot
8766e86c78 Merge "Avoid usage of LONG_BIT in signal headers." am: 2b64e4000d am: e3893280a4
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2038949

Change-Id: I6b7a6370fd0957aa26f887c989c40a31d06db937
Signed-off-by: Automerger Merge Worker
2022-03-24 21:40:34 +00:00
Treehugger Robot
e3893280a4 Merge "Avoid usage of LONG_BIT in signal headers." am: 2b64e4000d
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2038949

Change-Id: I2077f3b2dfbf05ac26575d3f456bf1e9e0d81b81
Signed-off-by: Automerger Merge Worker
2022-03-24 21:24:45 +00:00
Treehugger Robot
2b64e4000d Merge "Avoid usage of LONG_BIT in signal headers." 2022-03-24 21:10:41 +00:00
Peter Collingbourne
08b968b282 Avoid usage of LONG_BIT in signal headers.
Clang has its own limits.h which is ahead of ours on the inclusion
path. This header uses include_next to include our header, but only
in hosted mode. This means that in freestanding mode we don't get our
limits.h macro definitions, including LONG_BIT. This ends up causing
our signal.h to produce errors when included in freestanding mode on
32-bit platforms.

Fix the errors by replacing usage of LONG_BIT with (8 * sizeof(long))
in the signal headers.

Change-Id: I18ec7b6876d5f862beae09f0c011128eef97c869
2022-03-24 11:11:11 -07:00
Christopher Ferris
6712c39c0c Merge "Update to v5.17 kernel headers." am: 9263a823ea am: ceed1d8ec0
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2037786

Change-Id: I33b0ac629ed4f8426615e6bd06e4017cdf38a95f
2022-03-23 19:24:31 +00:00
Christopher Ferris
ceed1d8ec0 Merge "Update to v5.17 kernel headers." am: 9263a823ea
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2037786

Change-Id: Ie3d253811d84ee1c87557bceb5ad8164e0576a2c
2022-03-23 18:52:13 +00:00
Christopher Ferris
9263a823ea Merge "Update to v5.17 kernel headers." 2022-03-23 18:30:54 +00:00
Christopher Ferris
1ed5534657 Update to v5.17 kernel headers.
Kernel headers coming from:

Git: https://android.googlesource.com/kernel/common/
Branch: android-mainline
Tag: android-mainline-5.17

Test: Boots on a flame and all bionic unit tests pass.
Change-Id: I7057d7308241f3acfa600597d287994c39ababbc
2022-03-22 16:48:40 -07:00
Treehugger Robot
efd79e1208 Merge "Add DF_1_ORIGIN to SUPPORTED_DT_FLAGS_1." am: 8397fadb2e am: 3510d87bd7
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2035563

Change-Id: I0aeb0b4ee104999fe76be8d594e55c26b0fd3da8
2022-03-22 21:17:24 +00:00
Treehugger Robot
3510d87bd7 Merge "Add DF_1_ORIGIN to SUPPORTED_DT_FLAGS_1." am: 8397fadb2e
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2035563

Change-Id: I46ec11d3e87e5ef52de34b845674a6eb5df41ed6
2022-03-22 20:38:52 +00:00
Treehugger Robot
8397fadb2e Merge "Add DF_1_ORIGIN to SUPPORTED_DT_FLAGS_1." 2022-03-22 20:25:30 +00:00
Peter Collingbourne
7aa3abc781 Add DF_1_ORIGIN to SUPPORTED_DT_FLAGS_1.
This flag means "$ORIGIN processing required", and since we always
do that, we can claim support for it.

Change-Id: If60ef331963f6bc1e1818d7fa2ee57c1aa8fa343
2022-03-21 19:02:26 -07:00
Elliott Hughes
829eec4950 Merge changes from topic "revert-16712509-sc-dev-I3030c47be9d02a27505bd4775c1982a20755758c-sc-v2-dev-WCAVYOUACP" into sc-v2-dev-plus-aosp
* changes:
  [automerged blank] Revert "Disable pointer authentication in app processes." 2p: af2f109a9c
  Revert "Disable pointer authentication in app processes."
2022-03-16 20:41:09 +00:00
Elliott Hughes
45732ed64c Merge "Revert "[automerged blank] Disable pointer authentication in app..."" into sc-v2-dev-plus-aosp 2022-03-16 20:41:09 +00:00
Treehugger Robot
1bb92d2fb3 Merge "Suppress -Wformat warning" am: 8321ff1468 am: 7923456b83
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2027237

Change-Id: Ieeb6a55894b0a15a378debd97815958d44b14e5f
2022-03-16 19:56:14 +00:00
Treehugger Robot
7923456b83 Merge "Suppress -Wformat warning" am: 8321ff1468
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2027237

Change-Id: If4822c76ccd467bb391bb35f9d0bc1bc0a8c01eb
2022-03-16 19:33:31 +00:00
Treehugger Robot
8321ff1468 Merge "Suppress -Wformat warning" 2022-03-16 18:55:05 +00:00
Yi Kong
f9b1313968 Suppress -Wformat warning
This is exactly what it is testing for.

Original warning:
  bionic/tests/stdio_test.cpp:370:47: error: '%n' specifier not supported on this platform [-Werror,-Wformat]
    EXPECT_DEATH(snprintf(buf, sizeof(buf), "a %n b", &i), "%n not allowed on Android");
                                               ~^

Test: presubmit
Bug: 219872355
Change-Id: I6e378722b2d681cf64f4cf31ef000bd28203b00d
2022-03-16 08:15:15 +00:00
Elliott Hughes
cd9a0834e6 [automerged blank] Revert "Disable pointer authentication in app processes." 2p: af2f109a9c
Blank merge reason: Change-Id I3030c47be9d02a27505bd4775c1982a20755758c with SHA-1 bf52e88596 is in history

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

Change-Id: I216ac250d6c0ded5e0bb9322d35ba86ff9b5e660
2022-03-16 02:35:51 +00:00
Elliott Hughes
ed6d9720d4 Revert "[automerged blank] Disable pointer authentication in app..."
Revert submission 16712509-sc-dev-I3030c47be9d02a27505bd4775c1982a20755758c-sc-v2-dev

Reason for revert: PAC has shipped with S, and we're going with app compat outreach rather than regressing security.
Reverted Changes:
I3030c47be:Disable pointer authentication in app processes.
I3030c47be:Disable pointer authentication in app processes.
I84a696428:[automerged blank] Disable pointer authentication ...
Ibc52deaf3:[automerged blank] Disable pointer authentication ...

Change-Id: I4bbfb1cb5b2cf05b23b589d6c2c143073e26403b
2022-03-16 02:35:10 +00:00
Elliott Hughes
af2f109a9c Revert "Disable pointer authentication in app processes."
Revert "[automerged blank] Disable pointer authentication in app..."

Revert submission 16712509-sc-dev-I3030c47be9d02a27505bd4775c1982a20755758c-sc-v2-dev

Reason for revert: PAC has shipped with S, and we're going with app compat outreach rather than regressing security.
Reverted Changes:
I3030c47be:Disable pointer authentication in app processes.
I3030c47be:Disable pointer authentication in app processes.
I84a696428:[automerged blank] Disable pointer authentication ...
Ibc52deaf3:[automerged blank] Disable pointer authentication ...

Change-Id: I637d453a5b137841bcb794264b6f6c393fb924da
2022-03-16 02:35:10 +00:00
Colin Cross
27116ca6af Merge "Tweak linux_glibc properties for musl builds in bionic" am: 14e01ac5e2 am: 6b6d8f1ee6
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2019615

Change-Id: I40191447bc3ca05e7781ad69a7f5130e0b891f9b
2022-03-15 04:39:25 +00:00
Colin Cross
6b6d8f1ee6 Merge "Tweak linux_glibc properties for musl builds in bionic" am: 14e01ac5e2
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2019615

Change-Id: If7c07e7581c2caebe5bf301bb69acc47bbf5933c
2022-03-15 04:16:05 +00:00
Colin Cross
14e01ac5e2 Merge "Tweak linux_glibc properties for musl builds in bionic" 2022-03-15 03:47:57 +00:00
Elliott Hughes
38775c4ac1 Merge "Revert "Disable pointer authentication in app processes."" am: 93f3017e03 am: ba270227ed
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2021035

Change-Id: I589bc77e2eb2edd734c40587b4da932208e98b6f
2022-03-14 22:00:16 +00:00
Elliott Hughes
ba270227ed Merge "Revert "Disable pointer authentication in app processes."" am: 93f3017e03
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2021035

Change-Id: If6a9b14e64c60609fe3e81e9657ec4a98962eb09
2022-03-14 21:35:53 +00:00
Evgenii Stepanov
97ccc5b9e6 Merge "Fix mte tests to allow auto-upgrade." am: 17185eda89 am: f5fabaed4b
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2019123

Change-Id: Icc1f8df19fd0e39d1e92404f40bce487c724846b
2022-03-14 21:11:19 +00:00
Elliott Hughes
93f3017e03 Merge "Revert "Disable pointer authentication in app processes."" 2022-03-14 21:09:31 +00:00
Evgenii Stepanov
f5fabaed4b Merge "Fix mte tests to allow auto-upgrade." am: 17185eda89
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2019123

Change-Id: I4f48ba7bb4d72b53fdd28f09844ed72997afa618
2022-03-14 20:40:45 +00:00
Evgenii Stepanov
17185eda89 Merge "Fix mte tests to allow auto-upgrade." 2022-03-14 20:06:52 +00:00
Evgenii Stepanov
9705aac89a Fix mte tests to allow auto-upgrade.
The kernel MTE mode auto-upgrade feature (see mte_tcf_preferred) allows
silent auto-upgrade of Async MTE mode to Asymm or Sync depending on the
OS settings. Relax the tests to allow either Sync or Async faults when
requesting Async mode, and only Sync faults when requesting Sync.

Also tighten the MTENote test to check that both system allocator and
prctl are off when MTE is disabled.

Bug: 214622342
Test: bionic-unit-tests on fvp with all variations of
    /sys/devices/system/cpu/cpu*/mte_tcf_preferred=(async|asymm|sync)

Change-Id: I77a92789d6b330742d00b08c9f0fecc3a6c8fca6
2022-03-10 16:38:06 -08:00
Elliott Hughes
7309177235 Revert "Disable pointer authentication in app processes."
Revert submission 1954983-master-I3030c47be9d02a27505bd4775c1982a20755758c

Reason for revert: PAC has shipped with S, and we're going with app compat outreach rather than regressing security.
Reverted Changes:
I3030c47be:Disable pointer authentication in app processes.
I3030c47be:Disable pointer authentication in app processes.

Change-Id: I8761f08ddbd9077ff98b1a9a0c323de968792778
2022-03-10 18:01:04 +00:00
Colin Cross
da446cc5cc Tweak linux_glibc properties for musl builds in bionic
For convenience, builds against musl libc currently use the
linux_glibc properties because they are almost always linux-specific
and not glibc-specific.  In preparation for removing this hack,
tweak the linux_glibc properties by either moving them to host_linux,
which will apply to linux_glibc, linux_musl and linux_bionic, or
by setting appropriate musl or linux_musl properties.  Properties
that must not be repeated while musl uses linux_musl and also still
uses the linux_glibc properties are moved to glibc properties, which
don't apply to musl.  Whether these stay as glibc properties or get
moved back to linux_glibc later once the musl hack is removed is TBD.

Bug: 223257095
Test: m checkbuild
Test: m USE_HOST_MUSL=true host-native
Change-Id: I809bf1ba783dff02f6491d87fbdc9fa7fc0975b0
2022-03-08 15:07:57 -08:00
Colin Cross
e7de05c575 [automerger skipped] Merge "Use single module for libclang_rt.builtins-exported" am: 471bef4d34 am: c5264d793b -s ours
am skip reason: Merged-In I079f36f94b13e06d59a16cf665b65db76084021a with SHA-1 a765f193eb is already in history

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

Change-Id: If8fe832e8b9b6a5be336a33eb513e2ed27b1767e
2022-03-08 07:34:03 +00:00