Commit Graph

15177 Commits

Author SHA1 Message Date
Edwin Wong
83f2db8fc0 [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr overflow. am: 072cdf233c -s ours am: b64b770489 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I305e3d5ec027e9bf0802704aecdaf08bc9da6e2c
2021-06-02 22:04:34 +00:00
Edwin Wong
425466627b Fix potential decrypt src pointer overflow. am: c9b5693c7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13412307

Change-Id: I2e57da4ac02939aecb9cc06eff639e17bd4e46e0
2021-06-02 22:04:23 +00:00
chao.meng
ad6c07e4c8 [automerger skipped] DO NOT MERGE Add sleep(3) after stopSupplicant when VtsHalWifiSupplicant am: ca07893589 -s ours am: 8adb4f6581 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7fcf9ec936de79b8a670991b3b89c27aa2752f17
2021-06-02 22:04:18 +00:00
Treehugger Robot
09936c8c82 [automerger skipped] Merge "vts: wifi: softap and p2p are optional feature per CDD" into pie-vts-dev am: a5f27a462e am: 866ba26264 -s ours
am skip reason: skipped by user pateljay

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

Change-Id: I530e31e29b4e2f5fafa4d25ad52bd5e196e3c9b1
2021-06-02 22:03:53 +00:00
Steven Moreland
7283cbe8cb audio HAL - fix UAFs
Bug: 185259758
Test: N/A
Change-Id: I5ec70b098a00746108e10ab39e966607d78c84ae
Merged-In: I5ec70b098a00746108e10ab39e966607d78c84ae
(cherry picked from commit a8ac7cf706)
2021-04-16 18:36:09 +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
9fcd4886a3 [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: I3ec33cd444183f40ee76bec4c88dec0dac859cd3
2021-03-08 23:27:38 -08:00
Edwin Wong
a6e551feef [RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow.
There is a potential integer overflow to bypass the
destination base size check in decrypt. The destPtr
can then point to the outside of the destination buffer.

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

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

Bug: 176444622
Bug: 176496353
Change-Id: I71b390846a17aecbb9180865e1f9538b4b464abf
2021-02-25 17:43:13 +00:00
Edwin Wong
c14f262876 Fix potential decrypt src pointer overflow.
There is a potential integer overflow to bypass the
source base size check in decrypt. The source pointer
can then point to the outside of the source buffer,
which could potentially leak arbitrary memory content
to destination pointer.

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

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

Bug: 176496160
Bug: 176444786
Change-Id: I811a6f60948bde2a72906c2c6172fd7bc5feb6d9
2021-02-03 08:41:07 -08:00
Edwin Wong
b64b770489 [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr overflow. am: 072cdf233c -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c2e8361df80cd8b826aa3e36048f80d3362d253
2021-02-03 00:03:57 +00:00
Edwin Wong
072cdf233c [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr overflow.
There is a potential integer overflow to bypass the
source base size check in decrypt. The source pointer
can then point to the outside of the source buffer,
which could potentially leak arbitrary memory content
to destination pointer.

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

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

Bug: 176496160
Bug: 176444786
Change-Id: I5ed8921cbd7120e2f3841de1ea7b73d33539838f
2021-01-29 22:25:00 +00:00
Edwin Wong
c9b5693c7f Fix potential decrypt src pointer overflow.
There is a potential integer overflow to bypass the
source base size check in decrypt. The source pointer
can then point to the outside of the source buffer,
which could potentially leak arbitrary memory content
to destination pointer.

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

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

Bug: 176496160
Bug: 176444786
Change-Id: I811a6f60948bde2a72906c2c6172fd7bc5feb6d9
2021-01-28 17:58:30 +00:00
chao.meng
8adb4f6581 [automerger skipped] DO NOT MERGE Add sleep(3) after stopSupplicant when VtsHalWifiSupplicant am: ca07893589 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id2477370684e118a2bb722e3a857c69d165789c6
2020-11-12 03:31:23 +00:00
chao.meng
ca07893589 DO NOT MERGE Add sleep(3) after stopSupplicant when VtsHalWifiSupplicant
[root cause  ] VtsHalWifiSupplicant first stop supplicant, but framework will restart supplicant, the test will fail, according to Partner IssueTracker 169498893, AOSP suggest to add a blocking
[changes     ] add sleep(3)
[side effects]no
[self test   ]:yes
[download normally]:yes
[power on/off normally]:yes
[do common repository/branch inspection]:no
[is there dependence]:no
[confirm dependent commit]:no
[board]:unisoc
[test case]:VtsHalWifiSupplicant test
[reviewers   ] chao.meng
[change_type ] feature_bugfix
[tag_product ] common

Bug: 169498893
Change-Id: I7990226d346a3444f606951386e7c223fc87f98f
2020-11-06 00:28:08 +00:00
Treehugger Robot
866ba26264 Merge "vts: wifi: softap and p2p are optional feature per CDD" into pie-vts-dev am: a5f27a462e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1322162

Change-Id: I7eae2ae4cd49ee2384f197c7e94ce6c8fed45235
2020-06-22 14:37:11 +00:00
Treehugger Robot
a5f27a462e Merge "vts: wifi: softap and p2p are optional feature per CDD" into pie-vts-dev 2020-06-22 14:26:38 +00:00
jicheol.shin
d1a977b771 Fix issues for Japan model. am: c1e9656422 am: 4597fcc545
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1318339

Change-Id: I02d1d0b112e4514129477299bd002dda8feda7cb
2020-06-12 19:50:51 +00:00
jicheol.shin
4597fcc545 Fix issues for Japan model. am: c1e9656422
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1318339

Change-Id: I345b7ab6043fc3e40a9aecd025b01522f0d99214
2020-06-12 19:27:28 +00:00
Pierre Couillaud
504d3da1d8 vts: wifi: softap and p2p are optional feature per CDD
backport to P changes to ensure optional features are only
exercised if advertised as supported.

Bug: 73543546
Bug: 73306751
Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
Change-Id: I809a3eb90dfcc8ab37fdd3e2c60e432c7a686a49
2020-06-03 05:13:50 -07:00
jicheol.shin
c1e9656422 Fix issues for Japan model.
1. Docomo, Softbank, KDDI, and another Japan Operator request this.
   - During operation, the mobile device confirms the presence of the ICC and performs ICC outlier detection. If ICC disconnection is detected during operation, turn off the power within 5 seconds after detection, and perform power reset operation.

2.  "setSimCardPower power down"
   - After "setSimCardPower power down", SIM set power down. and ME is wating for "remove sim card" event, but phsically detect pin is still connected, so "remove" event never be sent, and ME can't reboot.

3. Japan model can not "setSimCardPower power up"
After "setSimCardPower power down", Japan model prepare for rebooting.
so so VTS requests "setSimCardPower power up", they can't do this.

Signed-off-by: Jicheol Shin <jicheol.shin@lge.com>

Test: VTS
Test: runc vts -m VtsHalRadioV1_1Target -t VtsHalRadioV1_1Target#RadioHidlTest_v1_1.setSimCardPower_1_1(slot1)_32bit
Test: runc vts -m VtsHalRadioV1_1Target -t VtsHalRadioV1_1Target#RadioHidlTest_v1_1.setSimCardPower_1_1(slot1)_64bit
Bug ID : 147969063
Change-Id: I524a16d04a7783f605913fd3ead15d3c1fbbc78b
(cherry picked from commit c89fd888a9)
2020-05-28 23:43:01 +00:00
Pawin Vongmasa
40afddbbe2 [automerger skipped] RESTRICT AUTOMERGE Relax timeout for all operations am: fcba82540c -s ours am: dd7bee61d1 -s ours
am skip reason: subject contains skip directive

Change-Id: I21063c1b113889ab4db26464a51f5c25f6612fb7
2020-03-19 18:37:23 +00:00
Pawin Vongmasa
dd7bee61d1 [automerger skipped] RESTRICT AUTOMERGE Relax timeout for all operations am: fcba82540c -s ours
am skip reason: subject contains skip directive

Change-Id: I5a22c4050ac8a87c22f7546cc9aad349e05565d9
2020-03-19 18:14:39 +00:00
Pawin Vongmasa
fcba82540c RESTRICT AUTOMERGE Relax timeout for all operations
Test: make vts -j123 && vts-tradefed run commandAndExit vts \
-m VtsHalMediaOmxV1_0Host

Bug: 70933963
Change-Id: I01e53e9e4e78e4bc5fd11f4e931d703c4fb5407d
2020-03-18 17:25:35 -07:00
Automerger Merge Worker
711ebe64dd Camera: Fix possible ExifUtils heap corruption am: aa5673385a
Change-Id: I209742be498ea65b6763cf673514e74241b75717
2020-03-04 17:58:31 +00:00
Emilian Peev
aa5673385a Camera: Fix possible ExifUtils heap corruption
Both EXIF_TAG_IMAGE_WIDTH and EXIF_TAG_IMAGE_LENGTH
expect short values as per EXIF spec. Call appropriate
libexif function to avoid possible heap corruption.

Bug: 148223871
Test: Successful build
Change-Id: Ib16bf1ae8ab2093da529efe6ff0778331c3e9eb3
2020-02-18 10:20:02 -08:00
Automerger Merge Worker
42b2f781be VTS: only assert that IGnssDebug present for non-automotive am: 2fd5c7cdf9 am: 984b3069bc
Change-Id: I4694449509de580da4049cef13458d35aed117af
2020-01-31 22:52:32 +00:00
Automerger Merge Worker
984b3069bc VTS: only assert that IGnssDebug present for non-automotive am: 2fd5c7cdf9
Change-Id: Ic74a1aa72b591d9b2d45a6c59e9944ed6def3a25
2020-01-31 22:40:50 +00:00
Johan Ankner
2fd5c7cdf9 VTS: only assert that IGnssDebug present for non-automotive
VTS test VtsHalGnssV1_0Target#GnssHalTest.GetAllExtensions tests that
IGnss::getEnxtensionGnssDebug returns an actual extension. Make an
exception for automotive devices.

Bug: 143966170
Test: ran VtsHalGnssV1_0Target on Volvo IHU

Change-Id: I1588099a5be704c7869d6d5e8c0312d8b498bb95
2020-01-23 09:01:14 +01:00
Automerger Merge Worker
119b9ea01d default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3 am: 86828796ac am: 44fa9a5cf0 am: 0e8630788f
Change-Id: I73b41a1aebe7dec987e637ca30c9d65b1aedc41e
2020-01-09 04:51:59 +00:00
Automerger Merge Worker
0e8630788f default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3 am: 86828796ac am: 44fa9a5cf0
Change-Id: Ie67b811fe2a172d9a33458ed5c23578c71a0a221
2020-01-09 04:33:04 +00:00
Automerger Merge Worker
44fa9a5cf0 default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3 am: 86828796ac
Change-Id: I4fac71fd9946d37a7a3b1d32a611f007de3e5303
2020-01-09 04:14:08 +00:00
Automerger Merge Worker
86828796ac default drm hidl: Fix decrypt destination base ptr am: d79abbb0d3
Change-Id: Ifaa69ef0ed98f90a42a66b7b64ef9d61457af107
2020-01-09 03:59:10 +00:00
Automerger Merge Worker
26be76d585 [automerger skipped] Merge "DO NOT MERGE: Audio HAL: do not test input stream if no Built-in mic on primary" into pie-vts-dev am: 356c36b96d -s ours am: 1acfd12deb -s ours
am skip reason: subject contains skip directive

Change-Id: I278b3c5408fb04a876400fdcf83de5a7bab240cd
2019-12-11 22:07:21 +00:00
Mikhail Naganov
1acfd12deb [automerger skipped] Merge "DO NOT MERGE: Audio HAL: do not test input stream if no Built-in mic on primary" into pie-vts-dev
am: 356c36b96d -s ours
am skip reason: subject contains skip directive

Change-Id: I0ef467cc98106b98bd0b3926013e65c5eb8e0fb3
2019-12-11 13:48:01 -08:00
Treehugger Robot
356c36b96d Merge "DO NOT MERGE: Audio HAL: do not test input stream if no Built-in mic on primary" into pie-vts-dev 2019-12-11 21:40:41 +00:00
Automerger Merge Worker
09a1eeda83 [automerger skipped] DO NOT MERGE: audio: Skip tests if audio HAL service lacks "primary" device am: f045e6b10d -s ours
am skip reason: subject contains skip directive

Change-Id: Id86a89bd4b705fd4aadedd62a5d6ad90e956dda7
2019-12-07 00:32:33 +00:00
Mikhail Naganov
f045e6b10d [automerger skipped] DO NOT MERGE: audio: Skip tests if audio HAL service lacks "primary" device
am: 1ed70316c5 -s ours
am skip reason: subject contains skip directive

Change-Id: Idb5bb585dc22bd6027f1177bbb90392aad464d4b
2019-12-06 16:16:26 -08:00
Mikhail Naganov
e6111852bc DO NOT MERGE: Audio HAL: do not test input stream if no Built-in mic on primary
The test used to always test input stream, assuming that all devices had
built-in device on the primary Module. Nevertheless, although uncommon,
the mic could be on any module or even not exist.

This patch makes sure that the input stream tests are only run if there
is a Built-in mic on the primary module.

This patch also fixes GetMicrophonesTest to accept NOT_SUPPORTED
result.

This patch is specific for Android P. Later versions already have
these fixes.

Bug: 114303641
Test: atest VtsHalAudioV4_0TargetTest
      on device with a built-in mic and on a device w/o

Change-Id: I7289724e5a73c1ffd09ca990f681844bdc8f6b3e
2019-12-04 10:41:23 -08:00
Robert Shih
d79abbb0d3 default drm hidl: Fix decrypt destination base ptr
Bug: 144351324
Test: poc_CryptoPlugin_155
Change-Id: Id5d221cd6978d55c46c0368aceb10c1d2f559fd9
2019-11-18 08:23:30 +00:00
Mikhail Naganov
1ed70316c5 DO NOT MERGE: audio: Skip tests if audio HAL service lacks "primary" device
Non-default audio service (e.g. MSD) is allowed not to have
a "primary" device. In this case tests that require it can be
skipped.

This is Android P specific version of the change.

Bug: 139321356
Bug: 141433379
Test: vts-tradefed run commandAndExit vts -m VtsHalAudioV4_0Target
      on a device with "msd" audio HAL module

Change-Id: I3b999664130013294cebd26976a1b18354926a5e
2019-11-04 13:31:02 -08:00
Brian Duddie
2e5961c0cb Add sensors 1.0 default HAL to uhid group
Ensures it can access /dev/uinput in Android Q, sepolicy permitting.

Bug: 142105193
Test: confirm hall sensor works again on marlin
Change-Id: I585c32d4da4bdc0917068e4d81adeca43d257e56
(cherry picked from commit 82299438b5)
2019-10-24 16:17:01 +00:00
Kevin Rocard
c12907a999 [automerger skipped] Merge "DO NOT MERGE: Audio VTS: Wait after stream close" into pie-vts-dev am: b0a0799f56 -s ours
am: f03eb1253b -s ours
am skip reason: subject contains skip directive

Change-Id: Id1e8b6a5183634e4fb20cb11e9d3535d74c9d2eb
2019-10-23 16:16:47 -07:00
Kevin Rocard
f03eb1253b [automerger skipped] Merge "DO NOT MERGE: Audio VTS: Wait after stream close" into pie-vts-dev
am: b0a0799f56 -s ours
am skip reason: subject contains skip directive

Change-Id: I8a5f3174c7c0b78cc7a263488e545e3b1c6f6e23
2019-10-23 16:10:45 -07:00
Treehugger Robot
b0a0799f56 Merge "DO NOT MERGE: Audio VTS: Wait after stream close" into pie-vts-dev 2019-10-23 22:57:06 +00:00
Kevin Rocard
17030494e3 DO NOT MERGE: Audio VTS: Wait after stream close
Due to asynchronous nature of the destruction of server-side objects
it is required to flush IPC messages to the server and wait to avoid
flakiness due to an attempt to open the stream while it's still not
closed on the server side.

This patch is specific for Android P release.

Test: atest VtsHalAudioV4_0TargetTest
Bug: 118655804
Change-Id: I1a5ec28bce9802ec654c139153ec4aa6786474e5
2019-10-22 16:44:13 +00:00
Kevin Rocard
659e415612 [automerger skipped] Merge "DO NOT MERGE: Audio HAL: Add missing device to XSD" into pie-vts-dev am: 999c5e83c4 -s ours
am: 09947556ed -s ours
am skip reason: subject contains skip directive

Change-Id: Ie37fd2635376d769589429436c3e7ee4ad6cfd5c
2019-10-17 11:05:29 -07:00
Kevin Rocard
09947556ed [automerger skipped] Merge "DO NOT MERGE: Audio HAL: Add missing device to XSD" into pie-vts-dev
am: 999c5e83c4 -s ours
am skip reason: subject contains skip directive

Change-Id: I4e6d97c8a49439c9edec7c981c2e18d0e86551ab
2019-10-17 10:59:27 -07:00
Treehugger Robot
999c5e83c4 Merge "DO NOT MERGE: Audio HAL: Add missing device to XSD" into pie-vts-dev 2019-10-17 16:44:10 +00:00
Kevin Rocard
abf6b1c889 DO NOT MERGE: Audio HAL: Add missing device to XSD
The XSD has to be kept manually synced to the HAL definition. When some
formats were introduced and the corresponding enum values were added in
the HAL .hal, the XSD was not updated.

This change is for P branch only.

Test: xmllint --noout --schema hardware/interfaces/audio/4.0/config/audio_policy_configuration.xsd  --xinclude out/target/product/*/vendor/etc/audio_policy_configuration.xml
Bug: 128967080
Change-Id: Iad91c510b9b908fdf5cabc46c61d7c687f1acd1e
2019-10-10 21:30:28 -07:00
Joshua Duong
803b7d9f18 Merge "Revert "Audio HAL: Add missing device to XSD"" into pie-vts-dev am: 75cfcfd3e2
am: 08880e6745

Change-Id: I7b875676a06b8c0c6b3b8d92bd7895c8c635cf6f
2019-10-10 13:13:30 -07:00