Commit Graph

4978 Commits

Author SHA1 Message Date
Alex Dale
fdd3816858 Merge "Extended Android file store error logs." into sc-dev am: 93cfe22910
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13736812

Change-Id: I8c7cc8bd3347684e3953e275e98bbb6f2eb637a9
2021-04-14 23:50:56 +00:00
Alex Dale
93cfe22910 Merge "Extended Android file store error logs." into sc-dev 2021-04-14 23:05:55 +00:00
Alex Dale
36dc9bb97b Extended Android file store error logs.
[ Merge of http://go/wvgerrit/120763 ]

This change introduces additional logging information for files and
file system operations on Android.

File reading and writing will attempt to make sense of |errno| and
log useful information.   In the event that the file must be closed,
the file stat will be printed.

Failures in determining the file size will print potential reasons for
the encountered error.

This partly restructures the File interface implementation to use file
descriptors instead of the C standard libraries FILE handle.  This is
done to ensure that |errno| is set to an expected value.

This change also introduces the utility functions SafeWrite() and
SafeRead() to handle common, retriable errors.

Bug: 178232354
Test: Android MediaDrm GTS and Android file-based unittests
Change-Id: I15a3c47a271098c9edb4bd9f619ed1a12dca6143
2021-04-09 14:23:24 -07:00
Alex Dale
766204f2b8 Merge "Cleaned up OEMCrypto security level getter." into sc-dev am: 985d0b5129
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14137665

Change-Id: I4709819030cb44c2ae5d7f4df190454b335d67e5
2021-04-09 21:12:46 +00:00
Alex Dale
eff0ef2713 Merge "Restructed reference root of trust (3/3 OEM Cert)" into sc-dev am: 9903798373
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13625377

Change-Id: I1539c4f04dcb38a5ef33ac42233233bdbf80d0c8
2021-04-09 21:12:43 +00:00
Alex Dale
74c1ab4cdc Merge "Restructed reference root of trust (2/3 DRM Cert)" into sc-dev am: cae8f6a04e
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13625376

Change-Id: Ife88e89ef54628034819a75dfd8a899a869253e4
2021-04-09 21:12:20 +00:00
Alex Dale
985d0b5129 Merge "Cleaned up OEMCrypto security level getter." into sc-dev 2021-04-09 20:59:39 +00:00
Alex Dale
9903798373 Merge "Restructed reference root of trust (3/3 OEM Cert)" into sc-dev 2021-04-09 20:48:47 +00:00
Alex Dale
cae8f6a04e Merge "Restructed reference root of trust (2/3 DRM Cert)" into sc-dev 2021-04-09 20:48:27 +00:00
Alex Dale
ccda4faf7b Cleaned up OEMCrypto security level getter.
[ Merge of http://go/wvgerrit/121566 ]

This clean up is part of a larger usage table initialization fix.

Bug: 169195093
Change-Id: I3ee818d1e5621f1f2fa64b189da4e66503d5e680
2021-04-09 01:34:56 -07:00
Rahul Frias
01baae563f Merge "Reword "blacklisted" to "forbidden"" into sc-dev am: 574dc28df5
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14128160

Change-Id: I1287ba5e0990628471bc8c0066a5c440c8b2b035
2021-04-09 08:32:27 +00:00
Rahul Frias
574dc28df5 Merge "Reword "blacklisted" to "forbidden"" into sc-dev 2021-04-09 07:38:26 +00:00
Rahul Frias
4b12b9c998 Merge "Correction to addition of LOCAL_LICENSE_KINDS to vendor/widevine" into sc-dev am: 6af4d181d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14117911

Change-Id: I13489d43e4385855a9ac01c247f8c4acae545e84
2021-04-09 02:59:37 +00:00
Rahul Frias
6af4d181d1 Merge "Correction to addition of LOCAL_LICENSE_KINDS to vendor/widevine" into sc-dev 2021-04-09 02:14:01 +00:00
Robert Shih
b9780710c7 Merge "libvtswidevine: replace appspot with uat" into sc-dev am: 1f8f0f1ccc
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14099570

Change-Id: I2c105cf52d26429af17c583ad6c727773d959170
2021-04-08 22:10:24 +00:00
Robert Shih
1f8f0f1ccc Merge "libvtswidevine: replace appspot with uat" into sc-dev 2021-04-08 21:36:07 +00:00
Rahul Frias
a40af9d1ef Reword "blacklisted" to "forbidden"
[ Merge of http://go/wvgerrit/113563 ]

Bug: 159847851
Test: WV unit/integration tests
Change-Id: I138b3e3291cb9e75841d092ca1bfa9a652ad9f9a
2021-04-08 11:54:06 -07:00
Rahul Frias
7c8d3e287e Correction to addition of LOCAL_LICENSE_KINDS to vendor/widevine
Remove incorrectly identified license files in http://go/ag/13998816

Bug: 68860345
Bug: 151177513
Bug: 151953481
Test: mm
Change-Id: I676a63598c8a7df11a1cef6d8bebcc9940c961dc
2021-04-08 07:56:48 +00:00
Edwin Wong
88f0efd027 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into qt-dev am: aabd91204a am: 389837df8c -s ours am: e2f3b13c78 am: 28d30a0af9 am: c3c05be7b6 -s ours am: c287730627 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: Ic0c2121c18ae323cfc2c9f26cc6b369ef8aed038
2021-04-07 02:00:23 +00:00
Edwin Wong
8ada235191 [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 9c278174c8 am: 605ae2e217 -s ours am: a423695ea0 am: 94cf4a7137 am: 6216c6e024 -s ours am: 4786786b6b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: I84fa5efe0f2e3377fe2ae4ae5418321dc1a7dd41
2021-04-07 02:00:22 +00:00
Edwin Wong
c287730627 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into qt-dev am: aabd91204a am: 389837df8c -s ours am: e2f3b13c78 am: 28d30a0af9 am: c3c05be7b6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: Ia65ed5196c9da55432844476a86caa6a1702fe78
2021-04-07 01:19:25 +00:00
Edwin Wong
4786786b6b [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 9c278174c8 am: 605ae2e217 -s ours am: a423695ea0 am: 94cf4a7137 am: 6216c6e024 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: I6ccf8ac5b3b596669b003c2034bd75342765f5d2
2021-04-07 01:19:23 +00:00
Edwin Wong
37b5463c6b [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into qt-dev am: aabd91204a am: 389837df8c -s ours am: e2f3b13c78 am: f21b00847b -s ours am: 6f1b7fab1e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: I97e86b52d038f8bc34d9dae693db4c933ddd70bc
2021-04-07 00:57:34 +00:00
Edwin Wong
ce36c11ee7 [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 9c278174c8 am: 605ae2e217 -s ours am: a423695ea0 am: c82acab577 -s ours am: 4a55a10d16 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: I49e00710652da5cdb765895f6e5281db5fb176e7
2021-04-07 00:57:33 +00:00
Edwin Wong
6f1b7fab1e [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into qt-dev am: aabd91204a am: 389837df8c -s ours am: e2f3b13c78 am: f21b00847b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: I011a4171cce3e92bd0d0f38438c894c44a348abd
2021-04-07 00:36:49 +00:00
Edwin Wong
4a55a10d16 [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 9c278174c8 am: 605ae2e217 -s ours am: a423695ea0 am: c82acab577 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: Ibdf9f8c5c666c19075350805ea1fa44472e0c5eb
2021-04-07 00:36:48 +00:00
Edwin Wong
c3c05be7b6 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into qt-dev am: aabd91204a am: 389837df8c -s ours am: e2f3b13c78 am: 28d30a0af9
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: I0cb9769784651c4a1b8c6267ccfea3b591a5eef1
2021-04-07 00:32:24 +00:00
Edwin Wong
6216c6e024 [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 9c278174c8 am: 605ae2e217 -s ours am: a423695ea0 am: 94cf4a7137
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: Ia241a9673a9cf281763f268fe8ea9b5f1a4f2a9c
2021-04-07 00:32:23 +00:00
Edwin Wong
f21b00847b [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into qt-dev am: aabd91204a am: 389837df8c -s ours am: e2f3b13c78
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: Ic51d0acefb24d6265cb42adc5b7447e43c6bc681
2021-04-06 23:52:20 +00:00
Edwin Wong
c82acab577 [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 9c278174c8 am: 605ae2e217 -s ours am: a423695ea0
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: I9ffa3d2b096e62f92848ea103be82ecad48e6c08
2021-04-06 23:52:20 +00:00
Edwin Wong
28d30a0af9 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into qt-dev am: aabd91204a am: 389837df8c -s ours am: e2f3b13c78
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: I893384792c4cf7677fff871433cf6228df7f0e7a
2021-04-06 23:47:33 +00:00
Edwin Wong
94cf4a7137 [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 9c278174c8 am: 605ae2e217 -s ours am: a423695ea0
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: I14c7cdded7ca2e41298594ac7df706ecb75989f1
2021-04-06 23:47:32 +00:00
Edwin Wong
e2f3b13c78 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into qt-dev am: aabd91204a am: 389837df8c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: I57e1cda75c201ab7c722d077be6aa94b22ebb617
2021-04-06 23:27:20 +00:00
Edwin Wong
a423695ea0 [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 9c278174c8 am: 605ae2e217 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: Id2b6c02ef85c826ce7b74b0a95797082b0845f5a
2021-04-06 23:27:19 +00:00
Edwin Wong
389837df8c Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into qt-dev am: aabd91204a
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: I842a3b15c82a20085825bfda63ee023feed4a653
2021-04-06 23:06:29 +00:00
Edwin Wong
605ae2e217 [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 9c278174c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499846

Change-Id: I1cb45d35088d149f02b0bb6c408e5fee3d79c1db
2021-04-06 23:06:28 +00:00
Edwin Wong
12bb9a6463 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into rvc-dev am: a6cc3b79d2 am: 7b380179e8 am: 5a3544e7d2 -s ours am: fb4b95ecc3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847

Change-Id: Ie460e2066bfad7d30b25412292f6d1c69d17a2d2
2021-04-06 23:06:25 +00:00
Edwin Wong
d582a1fff3 [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 76f39ddb08 am: 2c59c30f1b am: 79b4677c6e -s ours am: 0ad236bd04 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847

Change-Id: Ic2503cfe1f5f8fa5672d19a48e79dbf5d566a068
2021-04-06 23:06:24 +00:00
Edwin Wong
fb4b95ecc3 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into rvc-dev am: a6cc3b79d2 am: 7b380179e8 am: 5a3544e7d2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847

Change-Id: Ibb0484bb0f7cf71b24ceb2adf74bd363e1fce376
2021-04-06 22:49:37 +00:00
Edwin Wong
0ad236bd04 [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 76f39ddb08 am: 2c59c30f1b am: 79b4677c6e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847

Change-Id: Id3a5850cbb3b2e40d3034933f1a88b047839563d
2021-04-06 22:49:36 +00:00
Edwin Wong
8da0803930 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into rvc-dev am: a6cc3b79d2 am: 565bf1412a -s ours am: dfb89bddcd -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847

Change-Id: I1beb475350b3db047adbebf84d5d40920ef10b00
2021-04-06 22:46:05 +00:00
Edwin Wong
5270c0457a [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 76f39ddb08 am: a74c0ec1f0 -s ours am: 73eb4c2e8c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847

Change-Id: I34fd96285b331e7c4a0f14a41ee0f361514e295b
2021-04-06 22:46:03 +00:00
Edwin Wong
aabd91204a Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into qt-dev 2021-04-06 22:27:14 +00:00
Edwin Wong
dfb89bddcd [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into rvc-dev am: a6cc3b79d2 am: 565bf1412a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847

Change-Id: Id3190acf1d2fe9063aa963e8ad5a25f196281168
2021-04-06 22:27:01 +00:00
Edwin Wong
73eb4c2e8c [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 76f39ddb08 am: a74c0ec1f0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847

Change-Id: Ibd7e76d76dc65b836eeeeec4b9c13d483bc7f251
2021-04-06 22:27:00 +00:00
Edwin Wong
5a3544e7d2 Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into rvc-dev am: a6cc3b79d2 am: 7b380179e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847

Change-Id: Ia58ef580baab3ef4a5a2f07e9c51f13fce7ffc4c
2021-04-06 22:23:04 +00:00
Edwin Wong
79b4677c6e [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 76f39ddb08 am: 2c59c30f1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847

Change-Id: I9d84f4bc553f9c665d418734a9cf032bb4460a0c
2021-04-06 22:23:03 +00:00
Edwin Wong
565bf1412a Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into rvc-dev am: a6cc3b79d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847

Change-Id: I8395e9fe48ec01c35b2e0ad60a29d101f34af3ee
2021-04-06 21:53:49 +00:00
Edwin Wong
a74c0ec1f0 [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 76f39ddb08
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847

Change-Id: Ic310a2a04e47aea548ab74a6449c3f5835ee8049
2021-04-06 21:53:48 +00:00
Edwin Wong
7b380179e8 Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into rvc-dev am: a6cc3b79d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13499847

Change-Id: Ifccf528b9a903082878f1492f03e3e232c797b96
2021-04-06 21:49:15 +00:00