Commit graph

79724 commits

Author SHA1 Message Date
Treehugger Robot
2ad17c8d00 Merge "Remove an obsolete workaround." am: 7facdcca3d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2260461

Change-Id: Ifcc71c54c43086ec4bbf53e05040dd96b7cf57af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 18:27:37 +00:00
Treehugger Robot
7facdcca3d Merge "Remove an obsolete workaround." 2022-10-18 17:59:09 +00:00
Elliott Hughes
06a839fc77 Remove an obsolete workaround.
Bug: http://b/29412086
Test: treehugger
Change-Id: I3a61db8da234b4c150816af264d796da7dfe0af6
2022-10-18 16:31:04 +00:00
Treehugger Robot
b50730ecea Merge "Use ro.product.vendor.device to determine if running on Cuttlefish" am: 3ea0f312f5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2259202

Change-Id: Ib45d80e32cca2329707cc000323ed053cfc56b24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 11:31:00 +00:00
Treehugger Robot
3ea0f312f5 Merge "Use ro.product.vendor.device to determine if running on Cuttlefish" 2022-10-18 11:07:50 +00:00
Yi-yo Chiang
eb88e7b677 Use ro.product.vendor.device to determine if running on Cuttlefish
Similar reasoning as aosp/2255456. ro.product.device could be overridden
by GSI if system.img was replaced with GSI.
Use ro.product.vendor.device, which comes from the vendor.img, to
determine the "device" type.

Bug: 243116800
Test: adb-remount-test on cuttlefish
Change-Id: Ib4a956047ef46d8e4837b27334f8d58162d4fa2a
2022-10-18 07:34:45 +00:00
Yi-yo Chiang
784b56c4d7 Merge "fs_mgr_overlayfs: Add scratch size override system property" am: e7f5532e0a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2248416

Change-Id: I92fd94b9e04cef888abc752f088600948bc4410d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 07:20:29 +00:00
Yi-yo Chiang
e7f5532e0a Merge "fs_mgr_overlayfs: Add scratch size override system property" 2022-10-18 06:56:24 +00:00
Treehugger Robot
d972b874d0 Merge "riscv64 has no "other" to need an sepolicy." am: 2d7765c80c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2258762

Change-Id: Ic9f59cb8a378b17db2a076ff859d39fc416eca8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-17 23:52:30 +00:00
Treehugger Robot
2d7765c80c Merge "riscv64 has no "other" to need an sepolicy." 2022-10-17 23:29:49 +00:00
Elliott Hughes
356e83b23f riscv64 has no "other" to need an sepolicy.
Fixes
```
out/soong/installs-aosp_riscv64.mk:56833: error: overriding commands for target `out/target/product/generic_riscv64/system/etc/seccomp_policy/crash_dump.riscv64.policy', previously defined at out/soong/installs-aosp_riscv64.mk:56829
```

Test: m
Change-Id: I78a1c6b10dac2da704515f33b492ff37cc086dd6
2022-10-17 21:42:32 +00:00
Evgenii Stepanov
9fdbf07ad8 Merge "Harden CrasherTest::Trap under sanitizers." am: 4a93612db3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2254182

Change-Id: I8c47acb75cd3ea293b8d0110a6c76ca18bf9f93f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-17 20:52:48 +00:00
Treehugger Robot
77f14ae656 Merge "overlayfs: use overlayfs for f2fs readonly mode" am: 37b878dcea
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2255742

Change-Id: I2ccd57843e416a42d8e5fc226b4789024454cc45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-17 20:52:28 +00:00
Evgenii Stepanov
4a93612db3 Merge "Harden CrasherTest::Trap under sanitizers." 2022-10-17 20:47:31 +00:00
Treehugger Robot
37b878dcea Merge "overlayfs: use overlayfs for f2fs readonly mode" 2022-10-17 20:18:29 +00:00
Jaegeuk Kim
c114177985 overlayfs: use overlayfs for f2fs readonly mode
F2FS doesn't allow remount,rw for RO partition, so that it caused adb remount.
Fix it.

Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: Ia4410d08e8be344d79292c16a335a7e5be7a48bb
2022-10-17 11:38:45 -07:00
Elliott Hughes
428db87f3b Merge "Add tomstone proto support for riscv64" am: cfd803d5f5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2251621

Change-Id: Icabfcc43121eb02d78ffc7fec1b9e90c8e23e402
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-14 22:29:36 +00:00
Elliott Hughes
471f467f95 Merge "Add seccomp policy for riscv64 crash_dump" am: b9801d82e6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2251620

Change-Id: I6c90a6dc5c3081d4390dd0c7e32604165d5fe5a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-14 22:29:08 +00:00
Elliott Hughes
cfd803d5f5 Merge "Add tomstone proto support for riscv64" 2022-10-14 21:58:57 +00:00
Elliott Hughes
b9801d82e6 Merge "Add seccomp policy for riscv64 crash_dump" 2022-10-14 21:58:46 +00:00
Colin Cross
f04d5931b0 Merge "Disable code_coverage.other for riscv64" am: 0e6641a9ce
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2254118

Change-Id: I0ef909b0e904de44ce70ccb4c5945a7e44fda300
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-14 00:22:51 +00:00
Colin Cross
0e6641a9ce Merge "Disable code_coverage.other for riscv64" 2022-10-13 23:47:49 +00:00
Evgenii Stepanov
361455eb37 Harden CrasherTest::Trap under sanitizers.
The use of __builtin_abort in CrasherTest::Trap breaks with
-ftrap-function=abort, because then the argument of Trap is no longer in
the first argument register at the time of crash.

This flag is added when *any* sanitizer is enabled on the target, even harmless
ones like memtag-heap. See sanitize.go:769.

Fix CrasherTest::Trap to be a little more reliable.

Test: debuggerd_test with SANITIZE_TARGET=memtag_heap
Change-Id: I150f1c0355bd6f2bfabfa5a7bba125acdde1120e
2022-10-13 16:40:05 -07:00
Colin Cross
83fc3048d6 Disable code_coverage.other for riscv64
code_coverage.policy.other is supposed to install a policy for the
"other" architecture, e.g. arm for arm64.  riscv64 doesn't have an
"other" architecture, disable the module.

Test: builds
Change-Id: Ic42c706dd9c1efe4b0fe9fa7c9823a2a379ba56b
2022-10-13 13:49:10 -07:00
Treehugger Robot
88cc5f60c5 Merge "Fix bug in WriteStringToFileAtomic" am: 862f8b158c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2251734

Change-Id: I34e97fb316de84cc0cde71d497e902df66274729
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-13 19:01:45 +00:00
Treehugger Robot
862f8b158c Merge "Fix bug in WriteStringToFileAtomic" 2022-10-13 18:25:18 +00:00
Treehugger Robot
0ad558c55a Merge "libprocessgroup: Improve error messages" am: 29752d276e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2252953

Change-Id: Icf7f224055e33e2622bf78562047697cb1a6abb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-13 16:51:22 +00:00
Elliott Hughes
ae266da509 Merge "Add riscv64 support for debuggerd/crasher" am: 5a6834b441
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2251619

Change-Id: If85eaf41c06e734903a859c87f2d78fac40ef2ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-13 16:51:13 +00:00
Treehugger Robot
29752d276e Merge "libprocessgroup: Improve error messages" 2022-10-13 16:49:18 +00:00
Kelvin Zhang
7e05c04432 Fix bug in WriteStringToFileAtomic
According to https://www.slideshare.net/nan1nan1/eat-my-data ,
rename() without an fsync() is not safe, and cannot guarantee data
integrity in case of powerloss of OS failure.

Test: partner verification, th
Bug: 238702018
Change-Id: I5809770062ed7bfa47df81de418a2d8f7cbc6620
2022-10-13 09:43:44 -07:00
Elliott Hughes
5a6834b441 Merge "Add riscv64 support for debuggerd/crasher" 2022-10-13 16:12:47 +00:00
Tri Vo
ff099075a0 Merge "Implement getHardwareInfo() in Trusty KM TA" am: ad4ecd962c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2250103

Change-Id: I175718290fa6781497050f5255f5ce686921462b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 23:14:35 +00:00
Tri Vo
ad4ecd962c Merge "Implement getHardwareInfo() in Trusty KM TA" 2022-10-12 22:53:43 +00:00
Liu Cunyuan
8c0101b971 Add tomstone proto support for riscv64
Signed-off-by: Liu Cunyuan <liucunyuan.lcy@linux.alibaba.com>
Signed-off-by: Mao Han <han_mao@linux.alibaba.com>
Change-Id: Ie22c2895fc30fab68eddc18713c80e403f44b203
2022-10-12 22:31:45 +00:00
Chen Guoyin
a22af66e4b Add seccomp policy for riscv64 crash_dump
Signed-off-by: Chen Guoyin <chenguoyin.cgy@linux.alibaba.com>
Signed-off-by: Mao Han <han_mao@linux.alibaba.com>
Change-Id: Ie58bd7cf5dde792d8fba78602b5f53471752ab24
2022-10-12 22:31:39 +00:00
Xia Lifang
b13a10bb5d Add riscv64 support for debuggerd/crasher
Signed-off-by: Xia Lifang <lifang_xia@linux.alibaba.com>
Signed-off-by: Mao Han <han_mao@linux.alibaba.com>
Change-Id: I521c6da61cf2f6f67a73febf368068c430d94cdb
2022-10-12 22:30:27 +00:00
Elliott Hughes
620030d0a8 Merge changes I840cce02,I3dbe6b6d am: ef8ea8f9f6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2251617

Change-Id: Ie278d451084ba90c22b693d5e647e5dc88bc87d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 22:29:22 +00:00
Elliott Hughes
ef8ea8f9f6 Merge changes I840cce02,I3dbe6b6d
* changes:
  Add code_coverage seccomp policy for riscv64
  Add riscv64 support for libcutils
2022-10-12 21:58:56 +00:00
Bart Van Assche
7a952617f6 libprocessgroup: Improve error messages
Change two PLOG() statements into LOG() statements since PLOG() should
only be used if errno has been set. Make it easier to find the code that
logs an error message.

Bug: 213617178
Signed-off-by: Bart Van Assche <bvanassche@google.com>
Change-Id: I73443f3adb7d7ba3fc0d39a55777f0b132529fbd
2022-10-12 13:48:52 -07:00
Tri Vo
025b7f3cd8 Implement getHardwareInfo() in Trusty KM TA
Bug: 253109915
Test: VtsHalRemotelyProvisionedComponentTargetTest
Change-Id: I579d563759a3af97100da95dab6a99ca52d0b384
2022-10-12 10:35:49 -07:00
Chen Guoyin
0d77b388f5 Add code_coverage seccomp policy for riscv64
Signed-off-by: Chen Guoyin <chenguoyin.cgy@linux.alibaba.com>
Signed-off-by: Mao Han <han_mao@linux.alibaba.com>
Change-Id: I840cce02a087d05587bfa61824e9071732c16218
2022-10-12 22:22:09 +08:00
Liu Cunyuan
46ed34b68f Add riscv64 support for libcutils
Signed-off-by: Liu Cunyuan <liucunyuan.lcy@linux.alibaba.com>
Signed-off-by: Mao Han <han_mao@linux.alibaba.com>
Change-Id: I3dbe6b6d79c2655ab76f48e48fd22ab72d761dfd
2022-10-12 22:16:41 +08:00
Yi-Yo Chiang
15f94436b3 fs_mgr_overlayfs: Add scratch size override system property
Bug: 253207748
Test: Treehugger
Change-Id: I7140044d127e7db99d86decbe818be3680d26995
2022-10-12 20:23:19 +08:00
Yi-yo Chiang
95bfd05042 Merge "Replacing fs_mgr_dir_is_writable(work) with fs_mgr_rw_access(work) to check whether the scratch partition is writable." am: cf10e2097d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2169605

Change-Id: Iebb54bd467e49aabb8e229e68ad00bdeef4a0fcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 10:35:49 +00:00
Yi-yo Chiang
cf10e2097d Merge "Replacing fs_mgr_dir_is_writable(work) with fs_mgr_rw_access(work) to check whether the scratch partition is writable." 2022-10-12 10:06:48 +00:00
yi.sun
301adfcc07 Replacing fs_mgr_dir_is_writable(work) with fs_mgr_rw_access(work) to
check whether the scratch partition is writable.

Delate fs_mgr_dir_is_writable, as it may cause remount to fail.

Steps to reproduce:
1.adb root
2.adb remount
3.adb reboot
4.adb remount
5.push files to the system partition until the scratch partition is full
6.check that the Available of /mnt/scratch is zero through the df command
7.reboot
8.adb root
9.adb remount
Now, overlayfs failed to mount.

But I want to continue to view the files that were previously pushed to
the system partition.
Mounting of overlayfs should not be blocked when there is not enough space.
It seems reasonable to use fs_mgr_rw_access(work) to check whether
the partition is writable.
We should allow mount even if scratch is full, because this allows
the user to delete previously pushed files to free up space.

Bug: 240635368
Change-Id: I726ccd064cfabfab29789e7c690ea8cb574a6344
Signed-off-by: yi.sun <yi.sun@unisoc.com>
2022-10-12 03:06:22 +00:00
Thurston Dang
c1d3291221 Merge "storageproxyd: Add STORAGE_FILE_GET_MAX_SIZE API on Android side" am: aa9eb7c87a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2242480

Change-Id: If0680f400f62e440bcb8f2beb8c1f65e0491a099
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-12 00:52:19 +00:00
Thurston Dang
aa9eb7c87a Merge "storageproxyd: Add STORAGE_FILE_GET_MAX_SIZE API on Android side" 2022-10-12 00:27:03 +00:00
Akilesh Kailash
9a1278c5e4 Merge "init: Detach daemon only after sepolicy is loaded" am: 889b446810
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2155482

Change-Id: I0aab8b715dba643abd0255a1a494fb6c19062fc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 21:27:48 +00:00
Akilesh Kailash
889b446810 Merge "init: Detach daemon only after sepolicy is loaded" 2022-10-11 21:04:42 +00:00