Commit graph

77914 commits

Author SHA1 Message Date
David Anderson
fb14c7ed45 [automerger skipped] Merge "libdm: Redact keys from dm-crypt targets when calling GetTable." into sc-v2-dev am: 67ad3ba97e -s ours am: ea64e19a61 -s ours
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c9e000c7ac is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30086592

Change-Id: I48d01336b79725155ac56a978530ddb841cf2106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-16 01:29:57 +00:00
David Anderson
03470e533a [automerger skipped] libdm: Redact keys from dm-crypt targets when calling GetTable. am: e68f6cd6c0 -s ours am: 2b61791b2b -s ours
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c9e000c7ac is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30086592

Change-Id: Ia7a2f9b40cf1a7542da62e8f4cd3e9e2fbf09881
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-16 01:29:54 +00:00
David Anderson
ea64e19a61 [automerger skipped] Merge "libdm: Redact keys from dm-crypt targets when calling GetTable." into sc-v2-dev am: 67ad3ba97e -s ours
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c9e000c7ac is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30086592

Change-Id: Ice5e8757bd75b0e1677bffb90660300074a510fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-16 01:07:20 +00:00
David Anderson
2b61791b2b [automerger skipped] libdm: Redact keys from dm-crypt targets when calling GetTable. am: e68f6cd6c0 -s ours
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c9e000c7ac is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30086592

Change-Id: I26e2b07d7bed2a77d1ad01954206df20396f3ca9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-16 01:07:16 +00:00
David Anderson
67ad3ba97e Merge "libdm: Redact keys from dm-crypt targets when calling GetTable." into sc-v2-dev 2024-11-16 00:39:36 +00:00
David Anderson
342a9edfa9 [automerger skipped] Merge "libdm: Redact keys from dm-crypt targets when calling GetTable." into sc-qpr1-dev am: 3b92281e2f -s ours am: 6fe136b92b -s ours am: 186d0d0fec -s ours
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c434d801d6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30087167

Change-Id: Ieb1163481fda95d0cec8b91d69bf48e19393ed42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-16 00:30:51 +00:00
David Anderson
c4124697c8 [automerger skipped] libdm: Redact keys from dm-crypt targets when calling GetTable. am: c9e000c7ac -s ours am: e1c43c911e -s ours am: 417dcb2186 -s ours
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c434d801d6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30087167

Change-Id: Ic36b6cd6cf5766b7540e7a6704b5afb53c74bd0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-16 00:30:48 +00:00
David Anderson
186d0d0fec [automerger skipped] Merge "libdm: Redact keys from dm-crypt targets when calling GetTable." into sc-qpr1-dev am: 3b92281e2f -s ours am: 6fe136b92b -s ours
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c434d801d6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30087167

Change-Id: I08341ebf6a65417e39872c421dbbc942b0bc5a2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-16 00:07:52 +00:00
David Anderson
417dcb2186 [automerger skipped] libdm: Redact keys from dm-crypt targets when calling GetTable. am: c9e000c7ac -s ours am: e1c43c911e -s ours
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c434d801d6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30087167

Change-Id: Iaef3f5313822633eb9963c1c015d45c8b3058e5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-16 00:07:47 +00:00
David Anderson
6fe136b92b [automerger skipped] Merge "libdm: Redact keys from dm-crypt targets when calling GetTable." into sc-qpr1-dev am: 3b92281e2f -s ours
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c434d801d6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30087167

Change-Id: Iaa0df1942b6b92e3d4ff88df6015fb58f6756170
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-15 23:46:45 +00:00
David Anderson
e1c43c911e [automerger skipped] libdm: Redact keys from dm-crypt targets when calling GetTable. am: c9e000c7ac -s ours
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c434d801d6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30087167

Change-Id: Ifbe3f9191fa19200d6da964770089dd313329e86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-15 23:46:42 +00:00
David Anderson
3b92281e2f Merge "libdm: Redact keys from dm-crypt targets when calling GetTable." into sc-qpr1-dev 2024-11-15 23:29:53 +00:00
David Anderson
8c4dd701c5 [automerger skipped] Merge "libdm: Redact keys from dm-crypt targets when calling GetTable." into tm-dev am: ee84582db7 -s ours
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c434d801d6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30086987

Change-Id: Ic2b6982f6a9f3d03daad086ddf2f024a901de884
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-05 09:05:33 +00:00
David Anderson
2042d13d15 [automerger skipped] libdm: Redact keys from dm-crypt targets when calling GetTable. am: d94e6c537f -s ours
am skip reason: Merged-In I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d with SHA-1 c434d801d6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/30086987

Change-Id: I0d948d14466282f9ad72fad0f0679793259f35f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-05 09:05:29 +00:00
David Anderson
ee84582db7 Merge "libdm: Redact keys from dm-crypt targets when calling GetTable." into tm-dev 2024-11-05 08:40:56 +00:00
David Anderson
fedcbdb732 libdm: Redact keys from dm-crypt targets when calling GetTable. am: c434d801d6 am: 8dce05a18e am: 47bfad8f3c am: 5d784be343
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/29655996

Change-Id: Ib66f2662decdba23eb27189d96f10a6d9222393f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-30 23:19:47 +00:00
David Anderson
5d784be343 libdm: Redact keys from dm-crypt targets when calling GetTable. am: c434d801d6 am: 8dce05a18e am: 47bfad8f3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/29655996

Change-Id: Ia37bbdb92f5746eec3146e52d434afab376dd210
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-30 22:51:26 +00:00
David Anderson
47bfad8f3c libdm: Redact keys from dm-crypt targets when calling GetTable. am: c434d801d6 am: 8dce05a18e
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/29655996

Change-Id: I048018ab5632f0be827e17f5c65cee0d3b36cec3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-30 22:29:19 +00:00
David Anderson
8dce05a18e libdm: Redact keys from dm-crypt targets when calling GetTable. am: c434d801d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/29655996

Change-Id: I8cfb7d9e5fb532e4d36a961e1ebad9595fdb9a95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-30 22:12:51 +00:00
David Anderson
c434d801d6 libdm: Redact keys from dm-crypt targets when calling GetTable.
Ignore-AOSP-First: security fix
Bug: 368069390
Test: libdm_test
Change-Id: I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d
Merged-In: I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d
2024-10-26 02:28:50 +00:00
David Anderson
c9e000c7ac libdm: Redact keys from dm-crypt targets when calling GetTable.
Ignore-AOSP-First: security fix
Bug: 368069390
Test: libdm_test
Change-Id: I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d
Merged-In: I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d
2024-10-26 02:27:50 +00:00
David Anderson
e68f6cd6c0 libdm: Redact keys from dm-crypt targets when calling GetTable.
Ignore-AOSP-First: security fix
Bug: 368069390
Test: libdm_test
Change-Id: I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d
Merged-In: I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d
2024-10-25 22:26:59 +00:00
David Anderson
d94e6c537f libdm: Redact keys from dm-crypt targets when calling GetTable.
Ignore-AOSP-First: security fix
Bug: 368069390
Test: libdm_test
Change-Id: I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d
Merged-In: I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d
2024-10-25 22:24:32 +00:00
Jiyong Park
707ebf28e2 init: non-crashing service can restart immediately am: 555d2393b6 am: 43c7292e3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/28218458

Change-Id: I112a9ef5c68181b00770013cbc365ab93a9caea5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-24 20:52:33 +00:00
Jiyong Park
43c7292e3c init: non-crashing service can restart immediately am: 555d2393b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/28218458

Change-Id: I7073b0c1ef253661c44ee89872539a71ac84a833
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-24 20:22:12 +00:00
Jiyong Park
555d2393b6 init: non-crashing service can restart immediately
This CL allows restart_period to be set to a value shorter than 5s.
Previously this was prohibited to rate limit crashing services. That
behavior is considered to be a bit too conservative because some
services don't crash, but exit deliverately.

adbd is the motivating example. When adb root or adb unroot is
requested, it changes its mode of operation (via sysprop), exits itself,
and restarts (by init) to enter into the mode. However, due to the 5s
delay, the mode change can complete no earlier than 5 seconds after adbd
was started last time. This can slow the mode change when it is
requested right after the boot.

With this CL, restart_period can be set to a value smaller than 5. And
services like adbd can make use of it. However, in ordef to rate limit
crashing service, the default is enforced if the service was crashed
last time. In addition, such intended restart is not counted as crashes
when monitoring successive crashes during booting.

Bug: 286061817
Bug: 339844204
Test: /packages/modules/Virtualization/vm/vm_shell.sh start-microdroid \
 --auto-connect -- --protected
* with this change: within 2s
* without this change: over 6s
(cherry picked from https://android-review.googlesource.com/q/commit:0d277d777f290729fd9708b88f7ed57f0e0e49eb)
Merged-In: I1b3f0c92d349e8c8760821cf50fb69997b67b242
Change-Id: I1b3f0c92d349e8c8760821cf50fb69997b67b242
2024-07-24 18:23:52 +00:00
Automerger Merge Worker
cdb507f7f8 [automerger skipped] Merge changes from topic "am-42c0dbea3ac34fc69f4fc2fd082669b3" into android13-tests-dev am: bc49a17b24 -s ours am: 512d41a95b -s ours
am skip reason: Merged-In Ia77ace7513c48b1a14290c6ecc0222b46d6bf927 with SHA-1 7e5925ef02 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2913222

Change-Id: I32f873d183ae3275c3cb0d3112ef92465e86f409
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-25 21:21:19 +00:00
Automerger Merge Worker
83112f1560 [automerger skipped] Merge "Merge "sched_policy_test: set_sched_policy also set the cpuset policy as fallback" into android12-tests-dev am: ce34e32556" into android12L-tests-dev am: 421a3c69ad -s ours am: db8555c78e -s ours am: d2465b8332 -s ours
am skip reason: Merged-In Ia77ace7513c48b1a14290c6ecc0222b46d6bf927 with SHA-1 7e5925ef02 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2913222

Change-Id: If41590411408330475b3f95c2f0975aa6fb164cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-25 21:21:14 +00:00
Automerger Merge Worker
512d41a95b Merge changes from topic "am-42c0dbea3ac34fc69f4fc2fd082669b3" into android13-tests-dev am: bc49a17b24 -s ours
am skip reason: Merged-In Ia77ace7513c48b1a14290c6ecc0222b46d6bf927 with SHA-1 7e5925ef02 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2913222

Change-Id: I3d07b6e5592721c1c383fe4456356765a657b2f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-25 20:37:32 +00:00
Automerger Merge Worker
d2465b8332 [automerger skipped] Merge "Merge "sched_policy_test: set_sched_policy also set the cpuset policy as fallback" into android12-tests-dev am: ce34e32556" into android12L-tests-dev am: 421a3c69ad -s ours am: db8555c78e -s ours
am skip reason: Merged-In Ia77ace7513c48b1a14290c6ecc0222b46d6bf927 with SHA-1 7e5925ef02 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2913222

Change-Id: Id0fcd688a2553da6571f0f9ccefd69b9aea89bee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-25 20:37:29 +00:00
Automerger Merge Worker
bc49a17b24 Merge changes from topic "am-42c0dbea3ac34fc69f4fc2fd082669b3" into android13-tests-dev
* changes:
  [automerger skipped] Merge "Merge "sched_policy_test: set_sched_policy also set the cpuset policy as fallback" into android12-tests-dev am: ce34e32556" into android12L-tests-dev am: 421a3c69ad -s ours
  [automerger skipped] Merge "sched_policy_test: set_sched_policy also set the cpuset policy as fallback" into android12-tests-dev am: ce34e32556 am: 7a7bacd019 -s ours
2024-01-25 19:55:16 +00:00
Automerger Merge Worker
db8555c78e [automerger skipped] Merge "Merge "sched_policy_test: set_sched_policy also set the cpuset policy as fallback" into android12-tests-dev am: ce34e32556" into android12L-tests-dev am: 421a3c69ad -s ours
am skip reason: Merged-In Ia77ace7513c48b1a14290c6ecc0222b46d6bf927 with SHA-1 7e5925ef02 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2913222

Change-Id: I0429bf782d2461d0c3e581b4d6b0f6335b639edc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-25 19:55:11 +00:00
Edward Liaw
5f7df5fc4a [automerger skipped] Merge "sched_policy_test: set_sched_policy also set the cpuset policy as fallback" into android12-tests-dev am: ce34e32556 am: 7a7bacd019 -s ours
am skip reason: Merged-In Ia77ace7513c48b1a14290c6ecc0222b46d6bf927 with SHA-1 7e5925ef02 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2913222

Change-Id: I73173860a89228d2933ea37c75d99ac2f9c72731
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-25 19:55:06 +00:00
Edward Liaw
d3e91011ef Merge "sched_policy_test: set_sched_policy also set the cpuset policy as fallback" into android13-tests-dev am: 966dbfec30 am: 1f218b0f42
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2911926

Change-Id: I4b21ddbc7dacd2df62dd2d838b5f8db702f90a34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-25 19:54:10 +00:00
Automerger Merge Worker
421a3c69ad Merge "Merge "sched_policy_test: set_sched_policy also set the cpuset policy as fallback" into android12-tests-dev am: ce34e32556" into android12L-tests-dev 2024-01-25 19:11:31 +00:00
Edward Liaw
7a7bacd019 Merge "sched_policy_test: set_sched_policy also set the cpuset policy as fallback" into android12-tests-dev am: ce34e32556
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2913222

Change-Id: I4b8b44df9fc3a78fde2fe2eaa5f74063fc11efcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-25 19:11:14 +00:00
Edward Liaw
1f218b0f42 Merge "sched_policy_test: set_sched_policy also set the cpuset policy as fallback" into android13-tests-dev am: 966dbfec30
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2911926

Change-Id: Ie8314d80762aae949605163af1bc911548749609
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-25 19:10:38 +00:00
Edward Liaw
966dbfec30 Merge "sched_policy_test: set_sched_policy also set the cpuset policy as fallback" into android13-tests-dev 2024-01-25 18:45:48 +00:00
Edward Liaw
ce34e32556 Merge "sched_policy_test: set_sched_policy also set the cpuset policy as fallback" into android12-tests-dev 2024-01-25 18:45:38 +00:00
Edward Liaw
78eca9b78c sched_policy_test: set_sched_policy also set the cpuset policy as fallback
get_sched_policy uses the cpuset policy as fallback if the cpu cgroup
is not recognized.  Pixel is currently not using the cpu cgroup for
background policy due to b/208895940.

Bug: 265852986
Bug: 287704782
Test: atest libcutils_test:libcutils_test.SchedPolicy#set_sched_policy -- --abi arm64-v8a
Signed-off-by: Edward Liaw <edliaw@google.com>
(cherry picked from https://android-review.googlesource.com/q/commit:d5ffbdfc56a7c2510a3f1bdca9fd714f30a19434)
Merged-In: Ia77ace7513c48b1a14290c6ecc0222b46d6bf927
Change-Id: Ia77ace7513c48b1a14290c6ecc0222b46d6bf927
2024-01-24 00:10:34 +00:00
Edward Liaw
7e5925ef02 sched_policy_test: set_sched_policy also set the cpuset policy as fallback
get_sched_policy uses the cpuset policy as fallback if the cpu cgroup
is not recognized.  Pixel is currently not using the cpu cgroup for
background policy due to b/208895940.

Bug: 265852986
Bug: 287704782
Test: atest libcutils_test:libcutils_test.SchedPolicy#set_sched_policy -- --abi arm64-v8a
Signed-off-by: Edward Liaw <edliaw@google.com>
(cherry picked from https://android-review.googlesource.com/q/commit:d5ffbdfc56a7c2510a3f1bdca9fd714f30a19434)
Merged-In: Ia77ace7513c48b1a14290c6ecc0222b46d6bf927
Change-Id: Ia77ace7513c48b1a14290c6ecc0222b46d6bf927
2024-01-24 00:10:23 +00:00
Keith Mok
4281014b85 Add seal if ashmem-dev is backed by memfd am: 61a2897733 am: 7878e7c9b7 am: fb73f1789e am: 170c133259 am: 72add75484 am: 87675df8a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24776869

Change-Id: Ifce93a193d062ea6af1dd20bc18ecbc15f8cc6c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-28 00:36:10 +00:00
Keith Mok
87675df8a6 Add seal if ashmem-dev is backed by memfd am: 61a2897733 am: 7878e7c9b7 am: fb73f1789e am: 170c133259 am: 72add75484
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24776869

Change-Id: Ibc20777c221527cd61f0c005c5095c42c1ab5a40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 23:42:36 +00:00
Keith Mok
72add75484 Add seal if ashmem-dev is backed by memfd am: 61a2897733 am: 7878e7c9b7 am: fb73f1789e am: 170c133259
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24776869

Change-Id: I9c9177c3c1ddd27739554384d2a81c2bf4857dcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 22:43:54 +00:00
Keith Mok
170c133259 Add seal if ashmem-dev is backed by memfd am: 61a2897733 am: 7878e7c9b7 am: fb73f1789e
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24776869

Change-Id: Ieebb2b1f87aba8c1427cc4dfb112fe9f40e1956d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 21:42:53 +00:00
Keith Mok
fb73f1789e Add seal if ashmem-dev is backed by memfd am: 61a2897733 am: 7878e7c9b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24776869

Change-Id: Ie42fc973da02230d438455935f26458f8f94355f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 21:09:10 +00:00
Keith Mok
7878e7c9b7 Add seal if ashmem-dev is backed by memfd am: 61a2897733
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24776869

Change-Id: I816da3ae81e4eaa4ae120849b57e9685ef8e49de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 20:14:34 +00:00
Keith Mok
61a2897733 Add seal if ashmem-dev is backed by memfd
Need to seal the buffer size in align with ashmem if set to PROT_READ
only to prevent untrusted remote process to shrink the buffer size and
crash it.

Bug: 294609150
Test: build
Ignore-AOSP-First: Security
Change-Id: I9288cf30b41e84ad8d3247c204e20482912bff69
Merged-In: I9288cf30b41e84ad8d3247c204e20482912bff69
(cherry picked from commit f83c5c8fec)
2023-09-15 21:58:29 +00:00
Automerger Merge Worker
2d9d60a93d Merge "Merge "Merge "libcutils_test: static libjsoncpp" into android12-tests-dev am: 9825551dbf" into android12L-tests-dev am: 50cac03f37" into android13-tests-dev am: 2520bfb0d9 am: 1400b2dcaa
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2617475

Change-Id: I19a7e0ff5191ea2a11f4ee1bb3dd0f75388d2b4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 23:48:06 +00:00
Automerger Merge Worker
1400b2dcaa Merge "Merge "Merge "libcutils_test: static libjsoncpp" into android12-tests-dev am: 9825551dbf" into android12L-tests-dev am: 50cac03f37" into android13-tests-dev am: 2520bfb0d9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2617475

Change-Id: I811591f1eec3ea5b17469b6e2c7b9e3b706d1627
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 23:01:42 +00:00