Commit graph

11866 commits

Author SHA1 Message Date
Florian Mayer
920345607e Merge "Revert "[MTE] remap stacks with PROT_MTE when requested by dlopened library"" into main am: cebe1f1351 am: e8ea440525
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2954775

Change-Id: Ie5d41c895c8d2e0dccc2e87be9fc4455517406ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-08 20:06:48 +00:00
Florian Mayer
e8ea440525 Merge "Revert "[MTE] remap stacks with PROT_MTE when requested by dlopened library"" into main am: cebe1f1351
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2954775

Change-Id: I6a49c246c2415e6ae6c676d129f7d917b47bdf92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-08 19:30:28 +00:00
Florian Mayer
cebe1f1351 Merge "Revert "[MTE] remap stacks with PROT_MTE when requested by dlopened library"" into main 2024-02-08 18:47:42 +00:00
Elliott Hughes
048f9e5986 Merge "More libc/Android.bp simplification." into main am: 8259120694 am: cd0b553f42
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2955183

Change-Id: Idb0dff0df51160c10482c4873929979f8debb1b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-08 18:45:13 +00:00
Elliott Hughes
cd0b553f42 Merge "More libc/Android.bp simplification." into main am: 8259120694
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2955183

Change-Id: Ie4b1c4d6bf7c3803a7066323464749b9b33bc58d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-08 18:11:12 +00:00
Sojin Moon
c20e1c2bdf Revert "[MTE] remap stacks with PROT_MTE when requested by dlopened library"
This reverts commit 79c9694c91.

Reason for revert: DroidMonitor: Potential culprit for Bug b/324348078 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: I32f7bc824900e18a7d53b025ffe3aaef0ee71802
2024-02-08 07:21:15 +00:00
Elliott Hughes
2e2b9bcf3d More libc/Android.bp simplification.
Merge libc_bionic_ndk into libc_bionic.

Test: treehugger
Change-Id: I07dbb7e20e12000a2c18ff6fab2d5bd81db0cfcd
2024-02-07 16:10:23 -08:00
Kalesh Singh
50b9e8949b Merge changes Ie770320e,I32c05cce,Ia7cb2f40 into main am: 41ed53fac6 am: 653bf2a743
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2948920

Change-Id: Ied825554b52a68b4774e156a82458b47f1347bf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-07 20:59:59 +00:00
Kalesh Singh
653bf2a743 Merge changes Ie770320e,I32c05cce,Ia7cb2f40 into main am: 41ed53fac6
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2948920

Change-Id: Id2b075604fa8832f1f4b9729599a28a2276cac87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-07 20:19:59 +00:00
Kalesh Singh
41ed53fac6 Merge changes Ie770320e,I32c05cce,Ia7cb2f40 into main
* changes:
  bionic: linker_phdr: Introduce kPageSize
  bionic: Introduce ElfReader::ReadPadSegmentNote()
  bionic: Refactor __get_elf_note()
2024-02-07 19:28:40 +00:00
Elliott Hughes
8db29953ac Merge "Remove treble_linker_namespaces." into main am: aa19eae4c2 am: 63eb28c589
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2951946

Change-Id: I36e8df620bb1323ff3d5c3ad72d82cf8f8324604
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-07 17:28:59 +00:00
Elliott Hughes
63eb28c589 Merge "Remove treble_linker_namespaces." into main am: aa19eae4c2
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2951946

Change-Id: Icbbd2e8ccac65eb8e69e972258c385edb780b802
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-07 16:47:55 +00:00
Elliott Hughes
aa19eae4c2 Merge "Remove treble_linker_namespaces." into main 2024-02-07 16:05:57 +00:00
Kalesh Singh
f0050fb015 bionic: Refactor __get_elf_note()
Factor out generic __get_elf_note() logic and rename __get_elf_note() to
__find_elf_note(). Expose __get_elf_note() in libc/private/bionic_note.h

This will be used in the subsequent patch to test the presence of
NT_ANDROID_TYPE_PAD_SEGMENT note when loading segments.

Test: atest -c linker-unit-tests [Later patch]
Test: m && launch_cvd
Bug: 316403210
Change-Id: Ia7cb2f40b10cfaef402182a675087c8422b37e4d
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
2024-02-06 17:58:40 -08:00
Florian Mayer
79cd8b8519 Merge "[MTE] remap stacks with PROT_MTE when requested by dlopened library" into main am: ba5630cede am: f252b3fda6
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2901508

Change-Id: Id912233d287ce492657d5ebca053e5a7995bf113
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-06 17:40:52 +00:00
Florian Mayer
f252b3fda6 Merge "[MTE] remap stacks with PROT_MTE when requested by dlopened library" into main am: ba5630cede
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2901508

Change-Id: I23578f32fb295e96f6f074f00952e72dd3d9640e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-06 17:00:26 +00:00
Florian Mayer
ba5630cede Merge "[MTE] remap stacks with PROT_MTE when requested by dlopened library" into main 2024-02-06 16:16:03 +00:00
Florian Mayer
79c9694c91 [MTE] remap stacks with PROT_MTE when requested by dlopened library
BYPASS_INCLUSIVE_LANGUAGE_REASON="man" refers to manual not person

Bug: 318749472
Test: atest pthread on MTE enabled device
Test: atest memtag_stack_dlopen_test on MTE enabled device
Test: manual with NDK r26b built app with fsanitize=memtag-stack
Change-Id: Iac191c31b87ccbdc6a52c63ddd22e7b440354202
2024-02-05 18:17:24 -08:00
Elliott Hughes
ddd6bf1bfe Remove treble_linker_namespaces.
This is hard-coded on now.

Bug: http://b/67975799
Test: treehugger
Change-Id: Ifcf79ee3be1917827bbced40359a9f98ff5e7fd9
2024-02-06 00:29:40 +00:00
Aditya Choudhary
829c064ccc Merge "Migrate Test Targets to New Android Ownership Model" into main am: d7144fcdf0 am: 72f82334d5
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2946528

Change-Id: Ib29cccd2cba3862f451518437b56421ff031c2d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-04 22:14:00 +00:00
Aditya Choudhary
72f82334d5 Merge "Migrate Test Targets to New Android Ownership Model" into main am: d7144fcdf0
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2946528

Change-Id: I0c73cc7b9392f70936f629fe4a712569462cf237
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-04 21:29:43 +00:00
Aditya Choudhary
d7144fcdf0 Merge "Migrate Test Targets to New Android Ownership Model" into main 2024-02-04 20:48:36 +00:00
Elliott Hughes
1eab8c7988 Merge "Remove libc_ndk." into main am: 38dadd1225 am: dedf9f7a34
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2945353

Change-Id: I73206327c64afc26ec72df4fbbe7b292423f15f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-02 22:42:38 +00:00
Elliott Hughes
dedf9f7a34 Merge "Remove libc_ndk." into main am: 38dadd1225
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2945353

Change-Id: I8da5d3c71e071e0b1226f8107226ee2703d9e413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-02 21:59:37 +00:00
Elliott Hughes
38dadd1225 Merge "Remove libc_ndk." into main 2024-02-02 21:12:29 +00:00
Aditya Choudhary
d9d37c09d8 Migrate Test Targets to New Android Ownership Model
This CL is created as a best effort to migrate test targets to the new Android ownership model.
It is based on historical data from repository history and insights from git blame.
Given the nature of this effort, there may be instances of incorrect attribution. If you find incorrect or unnecessary
attribution in this CL, please create a new CL to fix that.

For detailed guidelines and further information on the migration please refer to the link below,
go/new-android-ownership-model

Bug: 304529413
Test: N/A
Change-Id: Ie36b2a3245d9901323affcc5e51dafbb87af9248
2024-02-02 13:57:12 +00:00
Elliott Hughes
6034df4abd Remove libc_ndk.
Literally unused!

Test: treehugger
Change-Id: Ic02c9573106444411af53c45ae4f818504a8254d
2024-02-01 17:13:57 -08:00
Treehugger Robot
1d4190f88d Merge "NFC: remove unnecessary branching" into main am: 8e631624e9 am: 7995a74a3d
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2940087

Change-Id: I92c57047906d1232d9386c5dd60ead5a36292c51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-01 20:59:38 +00:00
Treehugger Robot
7995a74a3d Merge "NFC: remove unnecessary branching" into main am: 8e631624e9
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2940087

Change-Id: I436a3a87b36753b944fc1a95e18b3f5d83e0d071
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-01 20:19:01 +00:00
Florian Mayer
d541611c77 NFC: remove unnecessary branching
Change-Id: Iac82f1fdc30261be262810de0d86369f0071044f
2024-01-31 23:09:39 +00:00
Xin Li
d70a5f022c Merge Android 24Q1 Release (ab/11220357)
Bug: 319669529
Merged-In: I884a78b67679c1f0b90a6c0159b17ab007f8cc60
Change-Id: Ie7928dbaee63c4e4d4b4f3854017933cbc3072a3
2024-01-29 10:10:43 -08:00
Elliott Hughes
7886caf36f Merge "libc/Android.bp: remove libc_pthread and libc_nopthread." into main am: 28c0d8b42c am: f0cc62cb42
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2928796

Change-Id: Idf4bb613b50c921c39a33c366a3ca58334b33356
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-27 01:39:50 +00:00
Elliott Hughes
c5b30874e6 Merge "Start removing unnecessary libc/Android.bp complexity." into main am: b02dbce7d8 am: ac23a05aac
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2929450

Change-Id: I42936248603a3431187babdb90d77d97bd6cc4a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-26 01:01:38 +00:00
Elliott Hughes
b094892bed libc/Android.bp: remove libc_pthread and libc_nopthread.
The motivation for these is long gone, and now they only serve to
distract/duplicate.

Test: treehugger
Change-Id: I28f4ea6dd02fb564a15ab23b9f70d447ddf0c090
2024-01-26 00:28:12 +00:00
Elliott Hughes
b02dbce7d8 Merge "Start removing unnecessary libc/Android.bp complexity." into main 2024-01-26 00:25:42 +00:00
Elliott Hughes
427931cdf5 Merge "Clarify which architectures do/don't need sa_restorer." into main am: 3a4a0c73bb am: dc7d5ab6a9
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2925677

Change-Id: I9d018f1f7dba1409c3782a9551ba0c5f340de917
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-26 00:17:25 +00:00
Elliott Hughes
99cc916f7a Start removing unnecessary libc/Android.bp complexity.
Things have gotten way out of hand in here...

Test: treehugger
Change-Id: I0dc6f9369828578409d422f76cb48a4553472d3e
2024-01-25 22:45:24 +00:00
Elliott Hughes
20a3661d6c Clarify which architectures do/don't need sa_restorer.
In particular: 32-bit x86 doesn't need sa_restorer either.

I still don't fully understand why arm32 and x86-64 do, so I've left the
comments in those .S files alone. I haven't (knowingly) tested
compiler-rt since we switched from libgcc (which is what the comments
refer to), but I have tested libunwindstack since we switched from
libunwind, and that does fail existing bionic tests for unwinds through
signal frames --- I just don't know why, or whether there's a better fix.

Anyway, local testing suggests that the 32-bit x86 code is vestigial, so
let's get rid of it.

Test: treehugger
Change-Id: I3e2616f736d27a8463814356e5adb52fd76a90cc
2024-01-24 14:25:00 -08:00
Elliott Hughes
0cdb68e704 Merge "Fix assembler warnings." into main am: 5c73b4f984 am: eebbd1db0f
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2701796

Change-Id: I770f4217d64c35eef5b361e41d5cd204be59d69f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-24 17:25:54 +00:00
Elliott Hughes
5c73b4f984 Merge "Fix assembler warnings." into main 2024-01-24 15:59:47 +00:00
Elliott Hughes
d7831208b2 Fix assembler warnings.
clang complains if you define a symbol and _then_ make it weak, rather
than the other way round:

  /tmp/setjmp-c3c977.s:90:1: warning: sigsetjmp changed binding to STB_WEAK
  .weak sigsetjmp;
  ^

Test: treehugger
Change-Id: Iee6b0ea456bb2e92aea810ce45f171caabaa89d2
2024-01-23 22:06:19 +00:00
Treehugger Robot
1eb127b9ea Merge "bpfmt all the .bp files to silence ayeaye." into main am: 6467c97105 am: 2569eb859b
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2918991

Change-Id: I7fc367f7c75495525fba093761c8354f1042a378
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-19 23:32:41 +00:00
Elliott Hughes
9c656905f5 Merge "Remove ODR violation with arm64 memrchr." into main am: 569b45dce5 am: 238310803e
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2918431

Change-Id: I57dceab03ef2603a24f3220ba570afb31d50d7e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-19 20:17:39 +00:00
Elliott Hughes
1eacc0edc0 bpfmt all the .bp files to silence ayeaye.
Test: treehugger
Change-Id: I5b7add6f013dcd2d4eee4851b7a2a22310c6d533
2024-01-19 19:05:36 +00:00
Elliott Hughes
569b45dce5 Merge "Remove ODR violation with arm64 memrchr." into main 2024-01-19 19:03:08 +00:00
Christopher Ferris
3c2690bb91 Merge "Update to v6.7 kernel headers." into main am: 599887ae3e am: e11a189edf
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2917312

Change-Id: Ie0525864d1de094666f1750a2bbd02dc26055bf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-19 02:13:20 +00:00
Elliott Hughes
1ab5d279a1 Remove ODR violation with arm64 memrchr.
I haven't seen this cause a problem in practice --- I noticed this while
looking at something else entirely.

Test: llvm-objdump
Change-Id: I56e38165f45554ede538a50439f8e8ffe72871c8
2024-01-19 00:08:23 +00:00
Christopher Ferris
0f79521706 Update to v6.7 kernel headers.
Kernel headers coming from:

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

NOTE: The file bionic/libc/kernel/uapi/linux/usb/f_accessory.h was
deleted in the 6.7 kernel along with the functionality. However,
there is no current replacement. For now keep the file here, but at
some point when the new implementation is ready, this file will need to
be moved to the places that still need to be backwards compatible.

Test: Builds and bionic unit tests pass on raven.
Test: Able to log in to an Android GO 32 bit device.
Change-Id: Ibf5684ed140616c02bb9464bbd6422a9281a29cf
2024-01-18 12:45:00 -08:00
Treehugger Robot
a04eb8aad4 Merge "Update libc/NOTICE." into main am: 6a25dff8a3 am: ff4284eb6a
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2915991

Change-Id: Ic2ced28ec18ef03ae62f820e0e73598174ea6b3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-18 03:16:10 +00:00
Elliott Hughes
78afa49091 Update libc/NOTICE.
Test: tools/update_notice.sh
Change-Id: I4068999ee3269f0db0a52eb2c65db8587f2f0911
2024-01-17 17:02:30 -08:00