Commit graph

73391 commits

Author SHA1 Message Date
Keith Mok
de50c0081b Merge changes I75017420,I3612e131 am: e3f4b84468
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1935479

Change-Id: I61e02fb220fe60da1a80a3fa8f2b92a42412e0d8
2022-01-06 00:09:14 +00:00
Keith Mok
e3f4b84468 Merge changes I75017420,I3612e131
* changes:
  Fix userspace fastboot with fuzzy test
  Fix fuzzy test on too large command
2022-01-05 23:50:12 +00:00
Keith Mok
d4213a2167 Merge "Fix typo in fuzzy_fastboot README" am: ba31ce8655
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1935477

Change-Id: Ib0da2feebdbfca35674f15d603de1330d8a8c09b
2022-01-05 19:00:52 +00:00
Keith Mok
ba31ce8655 Merge "Fix typo in fuzzy_fastboot README" 2022-01-05 18:43:16 +00:00
Rafay Kamran
aeb2b5871e Merge changes from topic "revert-1935201-OUHHJQVSHH" am: 416cda9bc7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1934983

Change-Id: I4d2d674e75665a5e45d5c78a4760409cc45b7336
2022-01-05 15:53:54 +00:00
Rafay Kamran
416cda9bc7 Merge changes from topic "revert-1935201-OUHHJQVSHH"
* changes:
  Revert "libsnapshot: Fix checks for compression to work with new..."
  Revert "libsnapshot: Fix libsnapshot_fuzzer_test."
2022-01-05 15:38:53 +00:00
Rafay Kamran
146f07e07b Revert "libsnapshot: Fix checks for compression to work with new..."
Revert submission 1935201

Reason for revert: DroidMonitor: Potential culprit for Bug http://b/213259099 - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Reverted Changes:
I219f956ba:libsnapshot: Fix libsnapshot_fuzzer_test.
I281937e26:libsnapshot: Fix checks for compression to work wi...

Change-Id: I88955a533ce7103111509785ed5bb40e1779b130
2022-01-05 14:55:37 +00:00
Rafay Kamran
f140d4d584 Revert "libsnapshot: Fix libsnapshot_fuzzer_test."
Revert submission 1935201

Reason for revert: DroidMonitor: Potential culprit for Bug http://b/213259099 - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Reverted Changes:
I219f956ba:libsnapshot: Fix libsnapshot_fuzzer_test.
I281937e26:libsnapshot: Fix checks for compression to work wi...

Change-Id: I33731556761cbdf603424fda94117973d3f21e21
2022-01-05 14:55:29 +00:00
Yi Kong
47707fb6fc Merge "Enable afdo for libutils" am: fe9b4ed7b8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1932625

Change-Id: I3a507cfa670b1e8d30eef3f83fdf10573c72364a
2022-01-05 06:16:10 +00:00
Yi Kong
fe9b4ed7b8 Merge "Enable afdo for libutils" 2022-01-05 06:00:25 +00:00
David Anderson
05f0e531c7 Merge "Remove support for AVB 1.0." am: 58e554e7ed
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1876217

Change-Id: I3b319be4b566c7fd7490e6b2c252fba2a526af60
2022-01-05 04:13:39 +00:00
David Anderson
58e554e7ed Merge "Remove support for AVB 1.0." 2022-01-05 03:57:20 +00:00
David Anderson
fc8ed5d9d5 Merge changes I219f956b,I281937e2 am: a216080a63
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1935201

Change-Id: Icbc7fa2fac8a085f5a4c4aceae519eff0292cfb1
2022-01-05 00:20:37 +00:00
David Anderson
a216080a63 Merge changes I219f956b,I281937e2
* changes:
  libsnapshot: Fix libsnapshot_fuzzer_test.
  libsnapshot: Fix checks for compression to work with new snapuserd.
2022-01-05 00:02:06 +00:00
Keith Mok
3724bbcbe9 Fix userspace fastboot with fuzzy test
Add more checking for fastboot to detect malformed
requests.
Such as checking no control characters in the command
send from host.
Make sure the download command length is eight bytes.
And report FAIL if download length is zero.

Test: adb reboot fastboot
      fuzzy_fastboot --gtest_filter=Fuzz.DownloadInvalid1
      fuzzy_fastboot --gtest_filter=Fuzz.DownloadInvalid2
      fuzzy_fastboot --gtest_filter=Fuzz.DownloadInvalid7
      fuzzy_fastboot --gtest_filter=Fuzz.DownloadInvalid8
Bug: 212628476
Change-Id: I750174205377395b5328923fb00462d078f3310d
2022-01-04 19:24:23 +00:00
Keith Mok
921ad28a30 Fix fuzzy test on too large command
Device might return I/O error instead of FAIL message
if command send to device is too large.
Since maximum command size in fastboto protocol is 64 bytes.
The device might only try to read 64 bytes for the bulk transfer,
sending data more than that might result in USB I/O error.

Do proper handler for that in fuzzy_fastboot and reset the USB
if I/O error encounter during the Comman.dTooLarge test

Test: adb reboot fastboot
      fuzzy_fastboot --gtest_filter=Fuzz.CommandTooLarge
      fuzzy_fastboot --gtest_filter=Fuzz.BadCommandTooLarge
Bug: 212628476
Change-Id: I3612e131de02435ee3ed7d18f2b2d20b50ae6c3f
2022-01-04 19:24:05 +00:00
Treehugger Robot
9a3cf3080c Merge "fastboot: Add system_dlkm flashing support" am: 5785297922
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1911211

Change-Id: I7bac00d663d1dc559cf964719ef47cbb191470db
2022-01-04 00:41:51 +00:00
Treehugger Robot
5785297922 Merge "fastboot: Add system_dlkm flashing support" 2022-01-04 00:28:41 +00:00
Keith Mok
66f6e63731 Fix typo in fuzzy_fastboot README
The fuzzy_fastboot does not output error
with invalid command line argument.

Fix typo in README for running with gtest_filter

Bug: 212628476
Test: N/A
Change-Id: I4a67a84807b59db50f063f1b9cf60dc964c1df20
2021-12-30 20:33:05 +00:00
David Anderson
34b726ddbe libsnapshot: Fix libsnapshot_fuzzer_test.
Rather than fix this up to work in all configurations, just
force-disable snapuserd testing for these tests.

This patch also adds a "UseUserspaceSnapshots" helper to IDeviceInfo so
we can simplify some checks in snapshot.cpp.

Bug: 208944665
Test: libsnapshot_fuzzer_test
Change-Id: I219f956ba09b090158d5ac757ef1f1d137d512e0
2021-12-29 22:17:26 -08:00
David Anderson
1637899632 libsnapshot: Fix checks for compression to work with new snapuserd.
Most checks for compression are used as a gate to decide whether dm-user
is enabled. However, dm-user can now be enabled without compression, so
these checks have to be audited and adjusted.

Once the "old" compression path is removed, these checks will become
simpler.

Bug: 208944665
Test: vts_libsnapshot_test -force_config vab
Change-Id: I281937e26427044f1ef2e1164d86d67e4170163a
2021-12-29 22:17:25 -08:00
Ramji Jiyani
b3ddb534c3 fastboot: Add system_dlkm flashing support
Bug: 200082547
Test: TreeHugger
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
Change-Id: I35e081bbe8674c102324d22d440dcc38493ec25b
2021-12-29 21:00:25 +00:00
Yi Kong
6ee028f165 Enable afdo for libutils
Enable PGO (profile guided optimisation) for better performance.

Test: presubmit
Bug: 195134194
Change-Id: If9abecd830573946fc52b28afd7599800367aa09
2021-12-23 15:57:40 +08:00
Maciej Żenczykowski
81f9294271 Merge "Move libipchecksum to frameworks/libs/net." am: fcf3fefe0b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1915930

Change-Id: I16c6d3d32b58a4984a6912e165d4e58e9816c793
2021-12-17 06:56:18 +00:00
Maciej Żenczykowski
fcf3fefe0b Merge "Move libipchecksum to frameworks/libs/net." 2021-12-17 06:34:42 +00:00
Treehugger Robot
2720b7f9e0 Merge changes Id0fe51d0,Ie3b3907b am: e0461422e1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1927607

Change-Id: I6315a7ab8655869ac851932a072feeeb954ff607
2021-12-17 01:21:50 +00:00
Treehugger Robot
e0461422e1 Merge changes Id0fe51d0,Ie3b3907b
* changes:
  Support building diagnose_usb against musl
  Support building fs_mgr against musl
2021-12-17 01:08:29 +00:00
Jiyong Park
3b14b98643 Merge "android::base::ResultError/Error are template classes" am: f5caf5b2e1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1918219

Change-Id: Ide2699eef86b2173e96d92f7ad2a6f09c20d1beb
2021-12-17 00:11:10 +00:00
Jiyong Park
f5caf5b2e1 Merge "android::base::ResultError/Error are template classes" 2021-12-16 23:54:16 +00:00
Jonglin Lee
bde7cc1b9c Merge changes from topic "revert-1926977-NUIGVFOGKB" am: 8aa3bf90c9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1927603

Change-Id: I3e85819bfe320ed7dbfaa8c9c1ff732e260451c5
2021-12-16 22:58:26 +00:00
Jonglin Lee
8aa3bf90c9 Merge changes from topic "revert-1926977-NUIGVFOGKB"
* changes:
  Revert "libsnapshot: Fix checks for compression to work with new..."
  Revert "libsnapshot: Fix libsnapshot_fuzzer_test."
2021-12-16 22:37:25 +00:00
Colin Cross
9f0e6493e5 Support building diagnose_usb against musl
Support building diagnose_usb against musl by reimplementing
group_member, which doesn't exist in musl and isn't used anywhere
else in the tree.

Bug: 190084016
Test: m USE_HOST_MUSL=true host-native
Change-Id: Id0fe51d0bd8677561d0bbdb72d3b1a956127a11c
2021-12-16 14:04:06 -08:00
Jonglin Lee
21feb62ea0 Revert "libsnapshot: Fix checks for compression to work with new..."
Revert submission 1926977

Reason for revert: suspect cause of b/211025818
Reverted Changes:
I215635645:libsnapshot: Fix libsnapshot_fuzzer_test.
I2afd64446:libsnapshot: Fix checks for compression to work wi...

Bug: 211025818
Change-Id: I16741798f6e7409ee98a2cb58d070938811e1697
2021-12-16 21:36:56 +00:00
Jonglin Lee
ca00555865 Revert "libsnapshot: Fix libsnapshot_fuzzer_test."
Revert submission 1926977

Reason for revert: suspect cause of b/211025818
Reverted Changes:
I215635645:libsnapshot: Fix libsnapshot_fuzzer_test.
I2afd64446:libsnapshot: Fix checks for compression to work wi...

Bug: 211025818
Change-Id: Ic8b4b20812b13964a061c93a0193ef93b572a045
2021-12-16 21:36:56 +00:00
Colin Cross
5186681f58 Support building fs_mgr against musl
Support building fs_mgr against musl by including the missing
sys/types.h header.

Bug: 190084016
Test: m USE_HOST_MUSL=true host-native
Change-Id: Ie3b3907b1c60ba550c04e8780f11b7adf09a6471
2021-12-16 12:49:33 -08:00
Wei Wang
9a576bfca7 Merge "libprocessgroup: fall back to cpuset in get_sched_policy" am: a5247158fb
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1922859

Change-Id: I6a3c8a688761eef51fa2c5ec40e48bf8afeb21b6
2021-12-16 20:44:35 +00:00
Wei Wang
a5247158fb Merge "libprocessgroup: fall back to cpuset in get_sched_policy" 2021-12-16 19:38:54 +00:00
Lorenzo Colitti
ee1e35c1df Move libipchecksum to frameworks/libs/net.
Test: m
Change-Id: I7dfaef630a3415c30025e572a8981fadd44ee5e3
2021-12-16 19:38:01 +00:00
David Anderson
86460ca6cc Merge changes I21563564,I2afd6444 am: f3b02fc2db
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1926977

Change-Id: Ic9e68ba8b3ae82eb7f17a7367b8152e919bcec78
2021-12-16 18:50:12 +00:00
David Anderson
f3b02fc2db Merge changes I21563564,I2afd6444
* changes:
  libsnapshot: Fix libsnapshot_fuzzer_test.
  libsnapshot: Fix checks for compression to work with new snapuserd.
2021-12-16 18:35:46 +00:00
David Drysdale
fb25985712 Merge "Report Trusty KeyMint as KmVersion::KEYMINT_2" am: f7eed000de
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1910047

Change-Id: I451ef8b033388f7b817b56464bd6dec5e0798640
2021-12-16 10:44:11 +00:00
David Drysdale
f7eed000de Merge "Report Trusty KeyMint as KmVersion::KEYMINT_2" 2021-12-16 09:37:15 +00:00
David Anderson
00c0cb8020 libsnapshot: Fix libsnapshot_fuzzer_test.
Rather than fix this up to work in all configurations, just
force-disable snapuserd testing for these tests.

This patch also adds a "UseUserspaceSnapshots" helper to IDeviceInfo so
we can simplify some checks in snapshot.cpp.

Bug: 208944665
Test: libsnapshot_fuzzer_test
Change-Id: I215635645d49ad21e80af7fe084e25669c64110c
2021-12-15 22:09:05 -08:00
David Anderson
5c1d54e092 libsnapshot: Fix checks for compression to work with new snapuserd.
Most checks for compression are used as a gate to decide whether dm-user
is enabled. However, dm-user can now be enabled without compression, so
these checks have to be audited and adjusted.

Once the "old" compression path is removed, these checks will become
simpler.

Bug: 208944665
Test: vts_libsnapshot_test -force_config vab
Change-Id: I2afd644464935c965d1b84205ef54ca605d32d78
2021-12-15 22:09:05 -08:00
Ramji Jiyani
bddb9e7b34 Merge "Create /system_dlkm mount point for GKI modules." am: 856817afe0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1899519

Change-Id: Idc86f84a07fc52c8f755452b33a0bffda964a299
2021-12-16 03:07:06 +00:00
Ramji Jiyani
856817afe0 Merge "Create /system_dlkm mount point for GKI modules." 2021-12-16 02:41:24 +00:00
Treehugger Robot
7a3e8c87b9 Merge "Diced: Added AID for Android's dice daemon diced." am: e71fdca896
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1886450

Change-Id: Ic35d1e7e97e3b7100eb0e64dd3867d846c35bfe6
2021-12-16 02:02:38 +00:00
Treehugger Robot
e71fdca896 Merge "Diced: Added AID for Android's dice daemon diced." 2021-12-16 01:47:23 +00:00
Treehugger Robot
9920254f06 Merge "Add instant trace methods" am: f54ebc7650
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1915700

Change-Id: I9ee77a748a4263ffba3f333acb168975a6341fdf
2021-12-15 18:28:53 +00:00
Treehugger Robot
f54ebc7650 Merge "Add instant trace methods" 2021-12-15 18:11:52 +00:00