Commits · 7f82601a52a6b27d2346903b44294f3827ba65a2 · halogenOS / android_frameworks_native

Oct 27, 2023

Merge "File size seal for memory mapped region" into tm-dev am: am: · 7f82601a

Keith Mok authored 1 year ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/24776199

Change-Id: I6635eb79be40cfb9a370217c4ee51ef4c7bd66c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

7f82601a

Merge "File size seal for memory mapped region" into tm-dev am: · c555aa2f

Keith Mok authored 1 year ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/24776199

Change-Id: I8e1c1c8577936533c67e4a3290285d62a0656de8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

c555aa2f

Merge "File size seal for memory mapped region" into tm-dev · c23f1b73
Keith Mok authored 1 year ago

c23f1b73

Oct 06, 2023

[automerger skipped] Merge "Add AppOps overload to be able to watch foreground... · b1ec1727

Atneya Nair authored 1 year ago

[automerger skipped] Merge "Add AppOps overload to be able to watch foreground changes." into sc-dev am: 001bb2fb am: 9fad56cb am: 3f8ed181 -s ours am: f7f5abfb -s ours am: 6f0810ee -s ours

am skip reason: Merged-In I89af46de557fbfc31d69613367a4e26a5222430a with SHA-1 83d1c723 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/22465455



Change-Id: I1085a1d195d61823df70830c967ac5720a128edf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

b1ec1727

Oct 05, 2023

[automerger skipped] Merge "Add AppOps overload to be able to watch foreground... · 6f0810ee

Atneya Nair authored 1 year ago

[automerger skipped] Merge "Add AppOps overload to be able to watch foreground changes." into sc-dev am: 001bb2fb am: 9fad56cb am: 3f8ed181 -s ours am: f7f5abfb -s ours

am skip reason: Merged-In I89af46de557fbfc31d69613367a4e26a5222430a with SHA-1 83d1c723 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/22465455



Change-Id: I13a8c4a45c9d2bb1fde0a94ed163cbb3cbb48fca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

6f0810ee

[automerger skipped] Merge "Add AppOps overload to be able to watch foreground... · f7f5abfb

Atneya Nair authored 1 year ago

[automerger skipped] Merge "Add AppOps overload to be able to watch foreground changes." into sc-dev am: 001bb2fb am: 9fad56cb am: 3f8ed181 -s ours

am skip reason: Merged-In I89af46de557fbfc31d69613367a4e26a5222430a with SHA-1 83d1c723 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/22465455



Change-Id: I9e411434599bd8b02f4f3f7aea9831d9812f0873
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

f7f5abfb

Merge "Add AppOps overload to be able to watch foreground changes." into... · 3f8ed181

Atneya Nair authored 1 year ago

Merge "Add AppOps overload to be able to watch foreground changes." into sc-dev am: 001bb2fb am: 9fad56cb

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/22465455

Change-Id: I092b912791841b4f3edd8c15901ad3cdeab64587
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

3f8ed181

Merge "Add AppOps overload to be able to watch foreground changes." into... · 09a2a503

Atneya Nair authored 1 year ago

Merge "Add AppOps overload to be able to watch foreground changes." into tm-dev am: 74824741 am: b9046129

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/22465454

Change-Id: I2e20233e8d3c44ce357e6a9ce358e11f339eb05b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

09a2a503

Merge "Add AppOps overload to be able to watch foreground changes." into sc-dev am: · 9fad56cb

Atneya Nair authored 1 year ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/22465455

Change-Id: I261f1e6f3309e2b2d685cb448c0c1f3ec35e3ae6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

9fad56cb

Merge "Add AppOps overload to be able to watch foreground changes." into tm-dev am: · b9046129

Atneya Nair authored 1 year ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/22465454

Change-Id: Idf084bfa1955aeb9cabce1e7f35ca50b9ceecc1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

b9046129

Merge "Add AppOps overload to be able to watch foreground changes." into sc-dev · 001bb2fb
Atneya Nair authored 1 year ago

001bb2fb
Merge "Add AppOps overload to be able to watch foreground changes." into tm-dev · 74824741
Atneya Nair authored 1 year ago

74824741

Sep 15, 2023

File size seal for memory mapped region · f2c1d9d2

Keith Mok authored 1 year ago

When using memfd for cross process communication, we always need to seal
the file size, otherwise remote process and shrink the size we memory
mapped and thus crash the originate process causing a DoS

Bug: 294609150
Test: Build
Ignore-AOSP-First: security
Change-Id: Ibc263c4f78df897e884378e3d984a188ca8772c7
Merged-In: Ibc263c4f78df897e884378e3d984a188ca8772c7
(cherry picked from commit 3d9f1e3b)

f2c1d9d2

Jul 11, 2023

[automerger skipped] Fix for heap-use-after-free in GPUService.cpp am:... · a8a53995

sergiuferentz authored 1 year ago

[automerger skipped] Fix for heap-use-after-free in GPUService.cpp am: 24a7874b am: bc5214e0 am: 2039b815 -s ours am: ea256bec -s ours am: 7ed143a5 -s ours

am skip reason: Merged-In I4d1d2d4658b575bf2c8f425f91f68f03114ad029 with SHA-1 7fb70780 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23905808



Change-Id: Idb98e606f3615c2a6f79e1e6f4474acc15cad3fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

a8a53995

[automerger skipped] Fix for heap-use-after-free in GPUService.cpp am:... · 7ed143a5

sergiuferentz authored 1 year ago

[automerger skipped] Fix for heap-use-after-free in GPUService.cpp am: 24a7874b am: bc5214e0 am: 2039b815 -s ours am: ea256bec -s ours

am skip reason: Merged-In I4d1d2d4658b575bf2c8f425f91f68f03114ad029 with SHA-1 7fb70780 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23905808



Change-Id: Icab0f8d912b0e4f9cc743ecadd9c5deac2a52fee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

7ed143a5

[automerger skipped] Fix for heap-use-after-free in GPUService.cpp am:... · ea256bec

sergiuferentz authored 1 year ago

[automerger skipped] Fix for heap-use-after-free in GPUService.cpp am: 24a7874b am: bc5214e0 am: 2039b815 -s ours

am skip reason: Merged-In I4d1d2d4658b575bf2c8f425f91f68f03114ad029 with SHA-1 7fb70780 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23905808



Change-Id: I3a1639cf19d7d0f4a33a247a8b185f3365525c47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

ea256bec

Fix for heap-use-after-free in GPUService.cpp am: am: · 2039b815

sergiuferentz authored 1 year ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23905808

Change-Id: I26c7c10dadc8f4eec8392130a0357e3505a5de00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2039b815

Fix for heap-use-after-free in GPUService.cpp am: · bc5214e0

sergiuferentz authored 1 year ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23905808

Change-Id: I82fbc5e1dab9df417fb7da6a18a8ebfac19a21f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

bc5214e0

Fix for heap-use-after-free in GPUService.cpp am: am: · 69580b9a

sergiuferentz authored 1 year ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23899871

Change-Id: I48fb105c71ef3d56643016445daa31fcfef6e5f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

69580b9a

Fix for heap-use-after-free in GPUService.cpp am: · 4ca2500f

sergiuferentz authored 1 year ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23899871

Change-Id: I786d52e608b0e8d31219b094e9c4b90c549491ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

4ca2500f

Jul 06, 2023

Fix for heap-use-after-free in GPUService.cpp · 24a7874b

sergiuferentz authored 1 year ago

This adds a unit test and fix for the bug reported by libfuzzer.
Changes made:
 * Expose GPUService as testable code.
 * Update main_gpuservice.cpp to use the new GpuService now located at
   gpuservice/GpuService.h
 * Make initializer threads members of GpuService
 * Join the threads in destructor to prevent heap-use-after-free.
 * Add unit test that waits 3 seconds after deallocation to ensure no
   wrong access is made.

Merged-In: I4d1d2d4658b575bf2c8f425f91f68f03114ad029
Bug: 282919145
Test: Added unit test and ran on device with ASAN
Change-Id: I4d1d2d4658b575bf2c8f425f91f68f03114ad029
(cherry picked from commit 3c00cbc0)

24a7874b

Jul 05, 2023

Fix for heap-use-after-free in GPUService.cpp · 7fb70780

sergiuferentz authored 1 year ago

This adds a unit test and fix for the bug reported by libfuzzer.
Changes made:
 * Expose GPUService as testable code.
 * Update main_gpuservice.cpp to use the new GpuService now located at
   gpuservice/GpuService.h
 * Make initializer threads members of GpuService
 * Join the threads in destructor to prevent heap-use-after-free.
 * Add unit test that waits 3 seconds after deallocation to ensure no
   wrong access is made.

Merged-In: I4d1d2d4658b575bf2c8f425f91f68f03114ad029
Bug: 282919145
Test: Added unit test and ran on device with ASAN
Change-Id: I4d1d2d4658b575bf2c8f425f91f68f03114ad029
(cherry picked from commit 3c00cbc0)

7fb70780

Jun 29, 2023

[automerger skipped] Merge "Allow sensors list to be empty" into tm-dev am:... · 74e8962f

Treehugger Robot authored 1 year ago

[automerger skipped] Merge "Allow sensors list to be empty" into tm-dev am: d6684f4b -s ours am: 07bf8f73 -s ours

am skip reason: Merged-In I091f57de9570b0ace3a8da76f16fe0e83f0aa624 with SHA-1 a7f26ab1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23677150



Change-Id: I2e6189890489ecb98bb31545ff45174b732c8b55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

74e8962f

[automerger skipped] Allow sensors list to be empty am: -s ours am: -s ours · 1e324d2f

Devin Moore authored 1 year ago

am skip reason: Merged-In I091f57de9570b0ace3a8da76f16fe0e83f0aa624 with SHA-1 a7f26ab1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23677150

Change-Id: I669fccd98a3bffe145d15a8d9a301a8a2a7c9f9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1e324d2f

[automerger skipped] Allow sensors list to be empty am: -s ours am:... · 08c9a88f

Devin Moore authored 1 year ago

[automerger skipped] Allow sensors list to be empty am: 7057a9f0 -s ours am: f83458bf -s ours am: 08e184f8 -s ours am: a02918ba -s ours am: eb76276b -s ours am: 5e8a5c97 -s ours am: b5e3f341 -s ours

am skip reason: Merged-In I091f57de9570b0ace3a8da76f16fe0e83f0aa624 with SHA-1 a7f26ab1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23677151



Change-Id: I77c54c05dbf87b8f4dd6039906bec6e4c25d55d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

08c9a88f

[automerger skipped] Allow sensors list to be empty am: -s ours am:... · 12e595b2

Devin Moore authored 1 year ago

[automerger skipped] Allow sensors list to be empty am: a7f26ab1 -s ours am: 4cba4ba7 -s ours am: 29229e7c -s ours am: 64a97f46 -s ours am: 1641d414 -s ours am: ca33ffa3 -s ours

am skip reason: Merged-In I091f57de9570b0ace3a8da76f16fe0e83f0aa624 with SHA-1 55e73922 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23677156



Change-Id: I703004e34b9c33bb6d3ecea168669deae85add84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

12e595b2

[automerger skipped] Allow sensors list to be empty am: -s ours am:... · 35d584c8

Devin Moore authored 1 year ago

[automerger skipped] Allow sensors list to be empty am: 55e73922 -s ours am: f6edcdaa -s ours am: c06ffa0f -s ours am: 24a83cb9 -s ours am: ae1574ed -s ours

am skip reason: Merged-In I091f57de9570b0ace3a8da76f16fe0e83f0aa624 with SHA-1 d447f022 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23677154



Change-Id: I8e980965f8e028d91ea33778267b15060a0d1a67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

35d584c8

[automerger skipped] Allow sensors list to be empty am: -s ours am:... · 5d7690b8

Devin Moore authored 1 year ago

[automerger skipped] Allow sensors list to be empty am: d447f022 -s ours am: 7f55c725 -s ours am: a330fd0a -s ours am: 2767f73d -s ours

am skip reason: Merged-In I091f57de9570b0ace3a8da76f16fe0e83f0aa624 with SHA-1 d86376e2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23677153



Change-Id: I740bbdf69abf51d9b7c05995a017f8dfa3b0c0c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

5d7690b8

[automerger skipped] Allow sensors list to be empty am: am:... · ac904f0d

Devin Moore authored 1 year ago

[automerger skipped] Allow sensors list to be empty am: d86376e2 am: 7a715246 am: 3ddc5396 -s ours

am skip reason: Merged-In I091f57de9570b0ace3a8da76f16fe0e83f0aa624 with SHA-1 427b5c36 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23677152



Change-Id: I178f69f928443110038c8b6368402aaf00bd5e49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

ac904f0d

[automerger skipped] Merge "Allow sensors list to be empty" into tm-dev am: -s ours · 07bf8f73

Treehugger Robot authored 1 year ago

am skip reason: Merged-In I091f57de9570b0ace3a8da76f16fe0e83f0aa624 with SHA-1 a7f26ab1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23677150

Change-Id: I863737d40cbf4d6d96e8a109b6bfba9a3f696883
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

07bf8f73

[automerger skipped] Allow sensors list to be empty am: -s ours · 9894e176

Devin Moore authored 1 year ago

am skip reason: Merged-In I091f57de9570b0ace3a8da76f16fe0e83f0aa624 with SHA-1 a7f26ab1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23677150

Change-Id: Ic7e24d9099ee4cc78c7c767f0724d079524a0f33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

9894e176

Merge "Allow sensors list to be empty" into tm-dev · d6684f4b
Treehugger Robot authored 1 year ago

d6684f4b

[automerger skipped] Allow sensors list to be empty am: -s ours am:... · b5e3f341

Devin Moore authored 1 year ago

[automerger skipped] Allow sensors list to be empty am: 7057a9f0 -s ours am: f83458bf -s ours am: 08e184f8 -s ours am: a02918ba -s ours am: eb76276b -s ours am: 5e8a5c97 -s ours

am skip reason: Merged-In I091f57de9570b0ace3a8da76f16fe0e83f0aa624 with SHA-1 a7f26ab1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23677151



Change-Id: I7e1aeb4b885fa6fa03e2d6d3c5818dbed6cc004f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

b5e3f341

[automerger skipped] Allow sensors list to be empty am: -s ours am:... · ca33ffa3

Devin Moore authored 1 year ago

[automerger skipped] Allow sensors list to be empty am: a7f26ab1 -s ours am: 4cba4ba7 -s ours am: 29229e7c -s ours am: 64a97f46 -s ours am: 1641d414 -s ours

am skip reason: Merged-In I091f57de9570b0ace3a8da76f16fe0e83f0aa624 with SHA-1 55e73922 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23677156



Change-Id: Ic58d2e9a0fd079e359e0977507c2e6ddc17776cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

ca33ffa3

[automerger skipped] Allow sensors list to be empty am: -s ours am:... · ae1574ed

Devin Moore authored 1 year ago

[automerger skipped] Allow sensors list to be empty am: 55e73922 -s ours am: f6edcdaa -s ours am: c06ffa0f -s ours am: 24a83cb9 -s ours

am skip reason: Merged-In I091f57de9570b0ace3a8da76f16fe0e83f0aa624 with SHA-1 d447f022 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23677154



Change-Id: I8b90d5be7f19b5f3de02e41da250ebb8e6d220a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

ae1574ed

[automerger skipped] Allow sensors list to be empty am: -s ours am:... · 2767f73d

Devin Moore authored 1 year ago

[automerger skipped] Allow sensors list to be empty am: d447f022 -s ours am: 7f55c725 -s ours am: a330fd0a -s ours

am skip reason: Merged-In I091f57de9570b0ace3a8da76f16fe0e83f0aa624 with SHA-1 d86376e2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23677153



Change-Id: I6268fe0d573a310c9b1d432ea27aa46930748ccf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2767f73d

Allow sensors list to be empty am: am: · 3ddc5396

Devin Moore authored 1 year ago

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23677152

Change-Id: I5ff625b5dd111fb81ba874dee9dd6ab1d9428f5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

3ddc5396

[automerger skipped] Allow sensors list to be empty am: -s ours am:... · 5e8a5c97

Devin Moore authored 1 year ago

[automerger skipped] Allow sensors list to be empty am: 7057a9f0 -s ours am: f83458bf -s ours am: 08e184f8 -s ours am: a02918ba -s ours am: eb76276b -s ours

am skip reason: Merged-In I091f57de9570b0ace3a8da76f16fe0e83f0aa624 with SHA-1 a7f26ab1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23677151



Change-Id: If6103e10ff97633ca84e9f3a38366212c465491d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

5e8a5c97

[automerger skipped] Allow sensors list to be empty am: -s ours am:... · 1641d414

Devin Moore authored 1 year ago

[automerger skipped] Allow sensors list to be empty am: a7f26ab1 -s ours am: 4cba4ba7 -s ours am: 29229e7c -s ours am: 64a97f46 -s ours

am skip reason: Merged-In I091f57de9570b0ace3a8da76f16fe0e83f0aa624 with SHA-1 55e73922 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23677156



Change-Id: Ia4357757ae21fa1377a39fa0877ce79269a3428c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1641d414

[automerger skipped] Allow sensors list to be empty am: -s ours am:... · 24a83cb9

Devin Moore authored 1 year ago

[automerger skipped] Allow sensors list to be empty am: 55e73922 -s ours am: f6edcdaa -s ours am: c06ffa0f -s ours

am skip reason: Merged-In I091f57de9570b0ace3a8da76f16fe0e83f0aa624 with SHA-1 d447f022 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23677154



Change-Id: Icd1bed0b85f9d74dff05ae2a1a2ca6c392c1f31a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

24a83cb9