Commit graph

28273 commits

Author SHA1 Message Date
Benjamin Schwartz
87905ec84c Merge "power/stats: Split channel name validation test" am: 43374307a3 am: 8ac06fbf1f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1668785

Change-Id: Icf347c3517742e1c0bfb75a605f512cad6f59219
2021-04-08 05:07:41 +00:00
Benjamin Schwartz
8ac06fbf1f Merge "power/stats: Split channel name validation test" am: 43374307a3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1668785

Change-Id: Id99d784fdd3ba2c2422475cf98683086e61f2ba9
2021-04-08 04:45:03 +00:00
Benjamin Schwartz
43374307a3 Merge "power/stats: Split channel name validation test" 2021-04-08 04:08:26 +00:00
Treehugger Robot
f33e183381 Merge "power/stats: Get scopedAStatus description in vts test" am: 471017034f am: 5c3f73cdaf
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1668405

Change-Id: I69bda96eebfc2d47f9eb6cd7c0de7bd77f12af53
2021-04-08 01:36:49 +00:00
Treehugger Robot
5c3f73cdaf Merge "power/stats: Get scopedAStatus description in vts test" am: 471017034f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1668405

Change-Id: I191293d4a82ca48a0804dcc7f98948ab2d4597da
2021-04-08 00:52:52 +00:00
Janis Danisevskis
9e9798b396 Merge "Security: Add @SensitiveData annotation." am: 71eb2258bf am: 250337e2fc
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1643003

Change-Id: Ic0bcf68b6c9d2ba0754543a574ec3254e01e7d8a
2021-04-08 00:31:51 +00:00
Treehugger Robot
471017034f Merge "power/stats: Get scopedAStatus description in vts test" 2021-04-08 00:13:25 +00:00
Benjamin Schwartz
1f6d550027 power/stats: Split channel name validation test
Bug: 184722506
Test: atest VtsHalPowerStatsTargetTest
Change-Id: I4354c2c750073fcf1f950d84ec7d910fc04e8684
2021-04-07 16:03:37 -07:00
Janis Danisevskis
250337e2fc Merge "Security: Add @SensitiveData annotation." am: 71eb2258bf
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1643003

Change-Id: I1f39f37e206bad8089f4280396c31a09174dda97
2021-04-07 22:55:05 +00:00
Benjamin Schwartz
e2404435a6 power/stats: Get scopedAStatus description in vts test
Bug: 184722506
Test: atest VtsHalPowerStatsTargetTest
Change-Id: I9e1a4f1965e901888963db74f68263d6a74b8204
2021-04-07 15:13:01 -07:00
Janis Danisevskis
71eb2258bf Merge "Security: Add @SensitiveData annotation." 2021-04-07 21:35:26 +00:00
Michael Butler
e1eb6b553d Merge "Change NNAPI time from steady_clock to boot_clock -- hal" am: d1626e1a4a am: 324752c753
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1666360

Change-Id: I63453fba652de45d6723a6a89094df35432bef94
2021-04-07 16:56:00 +00:00
Michael Butler
324752c753 Merge "Change NNAPI time from steady_clock to boot_clock -- hal" am: d1626e1a4a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1666360

Change-Id: I22238f0ac1c8e943379fb2879d9ac79261e7a3f7
2021-04-07 16:34:36 +00:00
Michael Butler
d1626e1a4a Merge "Change NNAPI time from steady_clock to boot_clock -- hal" 2021-04-07 15:58:45 +00:00
Janis Danisevskis
d73dc82a53 Merge "KeyMaster 4.0: Add missing tags to support library." am: 1b45e0c5c1 am: a9827dcd26
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1666159

Change-Id: I8fc6e6dfe3b35479434188fcef7f181894ff18de
2021-04-07 03:56:32 +00:00
Janis Danisevskis
a9827dcd26 Merge "KeyMaster 4.0: Add missing tags to support library." am: 1b45e0c5c1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1666159

Change-Id: Ieea68aa5c45048f1493b50fbbfc64f66fd006553
2021-04-07 03:06:23 +00:00
Janis Danisevskis
1b45e0c5c1 Merge "KeyMaster 4.0: Add missing tags to support library." 2021-04-07 02:33:23 +00:00
Edwin Wong
64e98c4f25 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into qt-dev am: 91a4fcb311 am: c7c4045f14 -s ours am: 09d70a56f4 am: 041e19dd25
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13499186

Change-Id: I1d98b0de22c008cb8bd20eeb39832ac915fc79ab
2021-04-07 00:32:25 +00:00
Edwin Wong
6ed862f81e [automerger skipped] [RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability. am: 9fcd4886a3 am: be8d2c6ebb -s ours am: 21f97ec264 am: db639ecf17
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13499186

Change-Id: I1092d90e6718ae9c86e625ac44fbc3d637187802
2021-04-07 00:32:23 +00:00
Edwin Wong
041e19dd25 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into qt-dev am: 91a4fcb311 am: c7c4045f14 -s ours am: 09d70a56f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13499186

Change-Id: I8bca8f892023177f641f2afd725a2155fd2237ef
2021-04-06 23:47:35 +00:00
Edwin Wong
db639ecf17 [automerger skipped] [RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability. am: 9fcd4886a3 am: be8d2c6ebb -s ours am: 21f97ec264
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13499186

Change-Id: Ia253d97d385ff379972eb112b6c76a038167929d
2021-04-06 23:47:32 +00:00
Edwin Wong
09d70a56f4 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into qt-dev am: 91a4fcb311 am: c7c4045f14 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13499186

Change-Id: Ic106b0e8d0d109dbf986c50cc97b93386c12427e
2021-04-06 23:27:22 +00:00
Edwin Wong
21f97ec264 [automerger skipped] [RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability. am: 9fcd4886a3 am: be8d2c6ebb -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13499186

Change-Id: Ide0c8906230f88e4d3d8d8fdf434ca0223315532
2021-04-06 23:27:19 +00:00
Edwin Wong
c7c4045f14 Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into qt-dev am: 91a4fcb311
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13499186

Change-Id: Ida94a5318e928a10b9c6348ef46faeb92b5f3254
2021-04-06 23:06:29 +00:00
Edwin Wong
be8d2c6ebb [RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability. am: 9fcd4886a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13499186

Change-Id: Ida447099c859dced6cd88744bc7ac2ba7c54188d
2021-04-06 23:06:28 +00:00
Edwin Wong
91a4fcb311 Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into qt-dev 2021-04-06 22:27:14 +00:00
Edwin Wong
60d80d4717 Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into rvc-dev am: 8e96e47c73 am: 05d2bd5975
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13812193

Change-Id: I58240a530ebe9560b54fab47dd23474260965012
2021-04-06 22:23:06 +00:00
Edwin Wong
5cb6291b8c [RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability. am: a4e76aab23 am: 6effd16a8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13812193

Change-Id: I9f61c6d6a2ead1a76c0af77caee2c18f922c79e3
2021-04-06 22:23:03 +00:00
Michael Butler
382d513dff Change NNAPI time from steady_clock to boot_clock -- hal
Previously, the NNAPI used std::chrono::steady_clock to represent and
measure timings. However, steady_clock does not count while the system
is suspended. Instead, boot_clock is monotonic like steady_clock but
does include the time when the system is suspended.

This change also indicates that services may convert from
std::chrono::steady_clock::time_point to
android::base::boot_clock::time_point in the HIDL 1.3 NN HAL.

Bug: 183118340
Test: mma
Test: VtsHalNeuralnetworksV1_3TargetTest
Test: VtsHalNeuralnetworksTargetTest
Test: presubmit
Change-Id: I5a7d039a31d9ce98602a301387ec99635f279f42
Merged-In: I5a7d039a31d9ce98602a301387ec99635f279f42
(cherry picked from commit b8cf54cf5a)
2021-04-06 15:00:49 -07:00
Edwin Wong
05d2bd5975 Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into rvc-dev am: 8e96e47c73
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13812193

Change-Id: I7cef0f328ce49e592f0bed6f48900517810ce198
2021-04-06 21:49:17 +00:00
Edwin Wong
6effd16a8b [RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability. am: a4e76aab23
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13812193

Change-Id: I59565fec934a5be32b5c5f32b6586965a7d9a932
2021-04-06 21:49:14 +00:00
Edwin Wong
8e96e47c73 Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into rvc-dev 2021-04-06 21:06:40 +00:00
Janis Danisevskis
9d363652af KeyMaster 4.0: Add missing tags to support library.
keymaster_tags.h was missing the tags
ATTESTATION_ID_SERIAL/IMEI/MEID.

Test: N/A
Bug: 183412538
Change-Id: I7216971a30fa1f42f152035bf79959f21bdbc09b
2021-04-06 12:54:57 -07:00
Treehugger Robot
dac506d64d Merge "Adds new error code which is required by keystore to handle strongbox hal related functionality. Test: N/A Bug: b/184306647" am: 0ff57e62a8 am: 65e7f5e54e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663579

Change-Id: I7fe48071e375f65a411dbe8f613fd31e546bd05c
2021-04-06 17:36:25 +00:00
Treehugger Robot
65e7f5e54e Merge "Adds new error code which is required by keystore to handle strongbox hal related functionality. Test: N/A Bug: b/184306647" am: 0ff57e62a8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663579

Change-Id: I4ed18bda76c765dec9ec527934f7599587605976
2021-04-06 17:01:25 +00:00
Janis Danisevskis
3829840d36 Security: Add @SensitiveData annotation.
Bug: 174857732
Test: N/A
Change-Id: Id1aeaf9b0da79b8c4d5e91f30942a31a26f7b1d4
2021-04-06 09:50:19 -07:00
Treehugger Robot
0ff57e62a8 Merge "Adds new error code which is required by keystore to handle strongbox hal related functionality. Test: N/A Bug: b/184306647" 2021-04-06 15:59:30 +00:00
Edwin Wong
d39d06d99c Merge "Fix potential decrypt destPtr overflow." into rvc-dev am: fc62c64de1 am: 2179627078
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13467452

Change-Id: I781f2833cc0c4c062f35097f8c2860fac4820eba
2021-04-05 22:37:14 +00:00
Michael Butler
9d0c3f1e77 Create NN AIDL Burst adapter am: 7a9d6092cd am: 4e6d013362
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663921

Change-Id: Icd28aea89f9911b207a266460eaeca116c6db719
2021-04-05 22:17:14 +00:00
Michael Butler
a4efef4f0e Add additional parameters for NN Burst -- HAL am: 8414a6ebf9 am: b19c1cbef3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663920

Change-Id: Ie07a7e22e17154b31382ccde3178afa439cc42a0
2021-04-05 22:17:13 +00:00
Michael Butler
0f10ee9eb3 Add missing validation for NN canonical types am: 388bcebc8f am: 2f59ea0610
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663919

Change-Id: If56450f4660b43770d5ebea5a52f31aaacff6330
2021-04-05 22:17:11 +00:00
Edwin Wong
2179627078 Merge "Fix potential decrypt destPtr overflow." into rvc-dev am: fc62c64de1
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13467452

Change-Id: If4aacd71d59955f315174047dda61e4dbd1e7e9a
2021-04-05 21:56:38 +00:00
Michael Butler
4e6d013362 Create NN AIDL Burst adapter am: 7a9d6092cd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663921

Change-Id: Icf672df81051c7a81857646f1f55dfe703030217
2021-04-05 21:36:08 +00:00
Michael Butler
b19c1cbef3 Add additional parameters for NN Burst -- HAL am: 8414a6ebf9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663920

Change-Id: If42779032ff2e6aa617c14a1f3e21379958eee05
2021-04-05 21:36:05 +00:00
Michael Butler
2f59ea0610 Add missing validation for NN canonical types am: 388bcebc8f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663919

Change-Id: Iab78bc898b2727be5000c9df2a4e52a1dd03345e
2021-04-05 21:35:29 +00:00
Edwin Wong
fc62c64de1 Merge "Fix potential decrypt destPtr overflow." into rvc-dev 2021-04-05 21:22:06 +00:00
Michael Butler
7a9d6092cd Create NN AIDL Burst adapter
Bug: 180492058
Bug: 177267324
Test: mma
Test: NeuralNetworksTest_static
Change-Id: I2947faeb3820faa963e4df1eaf7aefec57b66c79
Merged-In: I2947faeb3820faa963e4df1eaf7aefec57b66c79
(cherry picked from commit 504f44926c)
2021-04-02 22:03:12 -07:00
Michael Butler
8414a6ebf9 Add additional parameters for NN Burst -- HAL
Adds deadline and loopTimeoutDuration to nn::IBurst::execute.

This CL additionally adds a test case for
IPreparedModel::configureExecutionBurst and adds the suffix "_H" to
the header guards that were missing "_H".

Bug: 180492058
Bug: 177267324
Test: mma
Test: NeuralNetworksTest_static
Change-Id: Ic9ba2fb9b4dee4e40d99ae91bb9555a58d0508d2
Merged-In: Ic9ba2fb9b4dee4e40d99ae91bb9555a58d0508d2
(cherry picked from commit bbbdb0d5f1)
2021-04-02 22:02:38 -07:00
Michael Butler
388bcebc8f Add missing validation for NN canonical types
Bug: 177669661
Test: mma
Test: NeuralNetworksTest_static
Change-Id: Ic05c177f61a906a69bf82ff9c4d5bb8b0556d5ca
Merged-In: Ic05c177f61a906a69bf82ff9c4d5bb8b0556d5ca
(cherry picked from commit 08ee3f9287)
2021-04-02 22:02:02 -07:00
Edwin Wong
a4e76aab23 [RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability.
The shared memory buffer used by srcPtr can be freed by another
thread because it is not protected by a mutex. Subsequently,
a use after free AIGABRT can occur in a race condition.

SafetyNet logging is not added to avoid log spamming. The
mutex lock is called to setup for decryption, which is
called frequently.

The crash was reproduced on the device before the fix.
Verified the test passes after the fix.

Test: sts
  sts-tradefed run sts-engbuild-no-spl-lock -m StsHostTestCases --test android.security.sts.Bug_176495665#testPocBug_176495665

Test: push to device with target_hwasan-userdebug build
  adb shell /data/local/tmp/Bug-176495665_sts64

Bug: 176495665
Bug: 176444161
Change-Id: I4c83c44873eef960b654f387a3574fcad49c41a9
2021-04-02 21:50:49 +00:00