widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,392 Commits 2 Branches 0 Tags
9dbc32089f63a053914a2cc5eadcad8456fc05bd
Commit Graph

5392 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Edwin Wong
56860bc3dc [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow. am: 0558edfb31 -s ours am: ee4815ae80 -s ours am: 5e2f09293c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1cab6c1519ff1092ef54a7614a9a1b7a9aba8f01
 2021-07-13 22:03:13 +00:00
Cong Lin
7435874685 [automerger skipped] [RESTRICT AUTOMERGE] Clear mmapped page before releasing and re-generate am: 48cc1e57b8 -s ours am: 973140383a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib33ad87432e666c9eda1ffb2cbfdd9a226350a09
 2021-07-13 21:45:32 +00:00
Edwin Wong
91e37cf24d [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 51371f481f -s ours am: 5da29fc65d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifc56982b3b0fd70b636ca344f083f8f027396533
 2021-07-13 21:45:30 +00:00
TreeHugger Robot
304a9d6423 [automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability."" into pi-dev am: 28016986f5 -s ours am: dc4566325a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6e424e4cb038d8c60915eb5920fe36e5d34baf11
 2021-07-13 21:45:25 +00:00
Edwin Wong
e9f480cf2b [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into oc-mr1-dev am: 1e44ea96ef -s ours am: 0914ef7cd2 -s ours am: 46c2ba1705 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I78c332b0bbb52851a59786c538d3c793439afb43
 2021-07-13 21:45:18 +00:00
Edwin Wong
de20725d1a [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into pi-dev am: 9452ee5a55 -s ours am: 18fe74f4d9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie112ddf160809e9dfd919c9c3e6f5cc071033801
 2021-07-13 21:45:12 +00:00
Edwin Wong
9d02914fd7 [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow. am: 1bd967f9a8 -s ours am: 7752248af7 -s ours am: c4600c0f7d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I688ac733506263c800ae5161e6218b0c954a111c
 2021-07-13 21:44:59 +00:00
Edwin Wong
5e2f09293c [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow. am: 0558edfb31 -s ours am: ee4815ae80 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I552dc31fba2d6813e9bb7fa94f29e4a47618ff8c
 2021-07-13 21:44:50 +00:00
Cong Lin
973140383a [automerger skipped] [RESTRICT AUTOMERGE] Clear mmapped page before releasing and re-generate am: 48cc1e57b8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9f214a1f847974771d4ad7a52857774e0876b52d
 2021-07-13 21:29:25 +00:00
Edwin Wong
5da29fc65d [automerger skipped] [RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability. am: 51371f481f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaa8b143b5ebbb0e6ee672838c309808101b9939c
 2021-07-13 21:29:23 +00:00
TreeHugger Robot
dc4566325a [automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability."" into pi-dev am: 28016986f5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I621378760ad6737ce90e9420950ac48da49b7bf3
 2021-07-13 21:29:21 +00:00
Edwin Wong
46c2ba1705 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into oc-mr1-dev am: 1e44ea96ef -s ours am: 0914ef7cd2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0f9e47b06bebcd404589496e8834ddbc106f749a
 2021-07-13 21:28:58 +00:00
Edwin Wong
18fe74f4d9 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix WVCryptoPlugin use after free vulnerability." into pi-dev am: 9452ee5a55 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1c775fc2a6e4c094e003078c167a1256d0d7c776
 2021-07-13 21:28:53 +00:00
Edwin Wong
c4600c0f7d [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow. am: 1bd967f9a8 -s ours am: 7752248af7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I80f78b99b7afc28ff06270f114fd3e7929c3a7c7
 2021-07-13 21:28:38 +00:00
Edwin Wong
ee4815ae80 [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow. am: 0558edfb31 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9c8b8f3b2ca9d4891d89a5327f3fca39613989af
 2021-07-13 21:28:31 +00:00
Robert Shih
18f9235141 Add 1.3 widevine hidl target am: 20b7762982 am: 127b7c6e13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15191998

Change-Id: I716780ee5ecdcf7a75dae6be2bcaf710eeed2d3e
 2021-07-07 20:22:56 +00:00
Robert Shih
c1d1b9984a Add 1.3 widevine hidl target am: 20b7762982 am: 52f1fe284c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15191998

Change-Id: Ic44c40cf36a40bf6f1ee68c5bdd439a93f0c3251
 2021-07-07 20:18:18 +00:00
Robert Shih
127b7c6e13 Add 1.3 widevine hidl target am: 20b7762982 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15191998

Change-Id: I241adc8ceaf7cb839fc889086c0d914cf73c76e6
 2021-07-07 20:03:28 +00:00
Robert Shih
52f1fe284c Add 1.3 widevine hidl target am: 20b7762982 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15191998

Change-Id: I71f850f9aa4600bce9c7c9e3d7eebbcb983402ca
 2021-07-07 20:01:14 +00:00
Robert Shih
20b7762982 Add 1.3 widevine hidl target 
libwvhidl picked from the following builds:
+--------+---------+
| arch   | build   |
+--------+---------+
| arm    | 7520386 |
| arm64  | 7511028 |
| x86    | 7511028 |
| x86_64 | 7511028 |
+--------+---------+

Ran patchelf to set DT_SONAME to libwvhidl@1.3.so

Bug: 191881462
Test: atest MediaDrmTest#testOemCryptoVersion
Change-Id: I0f6c6750124d89145ef54c47d7dc8c95a7207063
 2021-07-02 23:24:38 -07:00
Alex Dale
7a026dfb02 Added write protection for session to engine map. am: b6cdd12394 am: f17153dfb1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15180882

Change-Id: I575071070156986ee7b5d05709a12f0dd80fbfc7
 2021-07-02 17:07:41 +00:00
Alex Dale
5dec140676 Added write protection for session to engine map. am: b6cdd12394 am: b7aa89024e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15180882

Change-Id: I02aa84ef497a1ac8fb6ae4b04aec85133819ccd5
 2021-07-02 17:07:16 +00:00
Alex Dale
b7aa89024e Added write protection for session to engine map. am: b6cdd12394 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15180882

Change-Id: Ic1c256fdee0f52a3d56879782c83f5b01f93788c
 2021-07-02 16:59:32 +00:00
Alex Dale
f17153dfb1 Added write protection for session to engine map. am: b6cdd12394 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15180882

Change-Id: If37cc5a40be8d798ec7de7ef9d112df40f484291
 2021-07-02 16:58:48 +00:00
Alex Dale
b6cdd12394 Added write protection for session to engine map. 
[ Merge of http://go/wvgerrit/128325 ]

There were a few cases where |cdm_by_session_id_| was being iterated
over and the CDM did not acquire any write-protection locks to prevent
other threads from changing the map simultaneously.

In particular, it was possible that while cleaning up a CDM, and
removing all the associated session in |cdm_by_session_id_| another
CDM could have been opening a session and creating a new association
in |cdm_by_session_id_| at the same time.

Cases where |cdms_| and/or |cdm_by_session_id_| is being written to or
iteratively read from should require a lock.  The iterator of
std::map maintains a "view" into the map's tree structure.  Modifying
the map (inserting or deleting elements) can potentially change the
structure of the map and the underlying assumptions built into an
iterator's view (ex, the iterator thinking there is an element to the
left or right).

Modifying the value within the map can potentially cause problems, but
is not applicable in our case (we modify the object pointed to by the
map element, but not the pointer itself).

Bug: 190405462
Test: build_and_run_all_unit_tests.sh and MediaDrmTest
Change-Id: I043e238570dac9a0db990f8fe66be271062b965c
 2021-07-01 18:37:18 -07:00
TreeHugger Robot
54c00460d3 Merge "[RESTRICT AUTOMERGE] Fix L3 clock loading issue" into sc-v2-dev am: bb62a534bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15113030

Change-Id: I556317618e53fcf5711f2c44e6aedfb7e4902550
 2021-07-01 23:47:44 +00:00
Cong Lin
75495dff9a [RESTRICT AUTOMERGE] Fix L3 clock loading issue am: e98c9150df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15113030

Change-Id: I906a6286557c897b984a403926d439f8e3b4bf0d
 2021-07-01 23:47:41 +00:00
TreeHugger Robot
bb62a534bf Merge "[RESTRICT AUTOMERGE] Fix L3 clock loading issue" into sc-v2-dev 2021-07-01 23:34:58 +00:00
Rahul Frias
17414e43a0 Merge "Disable expiration for legacy DRM certificates" into sc-dev am: a3657ab200 am: 48cc9dccc9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15144680

Change-Id: I31ff95bd87318a561b7a0935ecaca32fdb2db0e8
 2021-07-01 21:18:59 +00:00
Rahul Frias
5755a56e28 Merge "Disable expiration for legacy DRM certificates" into sc-dev am: a3657ab200 am: 5f2fd5a07f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15144680

Change-Id: Id9c6587a5469c560fec27adde55db88346d65565
 2021-07-01 21:18:37 +00:00
Rahul Frias
5f2fd5a07f Merge "Disable expiration for legacy DRM certificates" into sc-dev am: a3657ab200 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15144680

Change-Id: Iaffb18bcff400cf00a31f95ee9368d94f55d93ff
 2021-07-01 21:09:44 +00:00
Rahul Frias
48cc9dccc9 Merge "Disable expiration for legacy DRM certificates" into sc-dev am: a3657ab200 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15144680

Change-Id: Ife61e9e478484773ae9829b762b8fc861c74a646
 2021-07-01 21:09:13 +00:00
Rahul Frias
a3657ab200 Merge "Disable expiration for legacy DRM certificates" into sc-dev 2021-07-01 21:00:14 +00:00
Rahul Frias
309f816a54 Merge "Correct an error reported when a license is restored and then released" into sc-dev am: d30c5043d1 am: b7ebaab335 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15150547

Change-Id: Icc3776a12052b6727baca109d9edba261787d77e
 2021-07-01 19:37:14 +00:00
Rahul Frias
109b43e1a1 Merge "Correct an error reported when a license is restored and then released" into sc-dev am: d30c5043d1 am: 44cde1757a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15150547

Change-Id: Ib15fa5350d01b51a447713409d00552e1ff399c7
 2021-07-01 19:36:55 +00:00
Rahul Frias
44cde1757a Merge "Correct an error reported when a license is restored and then released" into sc-dev am: d30c5043d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15150547

Change-Id: I6417a1091f4d69055c2ecbed6e79bcc61b80f109
 2021-07-01 19:29:43 +00:00
Rahul Frias
b7ebaab335 Merge "Correct an error reported when a license is restored and then released" into sc-dev am: d30c5043d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15150547

Change-Id: If80e26d82eca8b8bb97d227ee06c76d267422458
 2021-07-01 19:29:15 +00:00
Rahul Frias
151d0b15d3 Disable expiration for legacy DRM certificates 
[ Merge of http://go/wvgerrit/128163 ]

In android S, we added a feature b/169740403 [Limited lifespan DRM
certificates with license preservation]

Due to uncertainties of when the provisioning service will
launch, we are disabling expiration for legacy DRM certificates.
If the feature does not launch in time, existing DRM certificates
will expire and be replaced. Offline licenses associated with these
expired DRM certificates will fail to load.

Expiration of legacy certificates will be reenabled at a later time.
The main portion of feature, the issuing of new DRM certificates with
expiration time will still be supported.

Bug: 192428783
Bug: 169740403
Test: WV unit/integration tests
Change-Id: I1d1184249848f215953a837f369528d3b74c9618
 2021-07-01 19:24:02 +00:00
Rahul Frias
d30c5043d1 Merge "Correct an error reported when a license is restored and then released" into sc-dev 2021-07-01 19:17:21 +00:00
Alex Dale
c4946e61c4 Merge "PST and non PST can handle unlimited license durations." into sc-dev am: 1229aedcea am: f56fdbef3f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15159035

Change-Id: I2dd797a0364519fb1b7e700a8e3c099f808cc04c
 2021-07-01 07:09:50 +00:00
Alex Dale
ca0ce02872 Merge "PST and non PST can handle unlimited license durations." into sc-dev am: 1229aedcea am: 4ed10d691f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15159035

Change-Id: Icd40761b28213d02f849dbcb7cf46e73eebe3f3b
 2021-07-01 07:09:28 +00:00
Alex Dale
4ed10d691f Merge "PST and non PST can handle unlimited license durations." into sc-dev am: 1229aedcea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15159035

Change-Id: I4c6493fd8a2abfdddcaa6b6b694122b814c27118
 2021-07-01 06:57:30 +00:00
Alex Dale
f56fdbef3f Merge "PST and non PST can handle unlimited license durations." into sc-dev am: 1229aedcea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15159035

Change-Id: I37155d9ab27ed16bb21a873f4827aa9684db4da2
 2021-07-01 06:56:25 +00:00
Alex Dale
1229aedcea Merge "PST and non PST can handle unlimited license durations." into sc-dev 2021-07-01 06:45:07 +00:00
Alex Dale
abc0311f93 Merge "Updated integration test to handle unlimited license durations." into sc-dev am: 16a0ab2309 am: da0d78bf0b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15136759

Change-Id: I32aadbe3815e84f87933447c0baf832d3bc5b6e7
 2021-07-01 06:03:02 +00:00
Alex Dale
6ef83672ca Merge "Updated integration test to handle unlimited license durations." into sc-dev am: 16a0ab2309 am: d7f36baddc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15136759

Change-Id: Ibe2b1d69ffbb53e46b1da09696a782af3edc9d77
 2021-07-01 05:57:29 +00:00
Alex Dale
da0d78bf0b Merge "Updated integration test to handle unlimited license durations." into sc-dev am: 16a0ab2309 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15136759

Change-Id: I975afd30a91155770f9e21e48db5184ef63440f4
 2021-07-01 05:51:31 +00:00
Alex Dale
d7f36baddc Merge "Updated integration test to handle unlimited license durations." into sc-dev am: 16a0ab2309 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15136759

Change-Id: I59fb3001fe68c6d7a34844957552b552207a35ba
 2021-07-01 05:49:52 +00:00
Alex Dale
16a0ab2309 Merge "Updated integration test to handle unlimited license durations." into sc-dev 2021-07-01 05:35:29 +00:00
Fred Gylys-Colwell
4b1059fd08 Merge "Cache security level" into sc-dev am: 47324cc6fe am: 1c82e33cb8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15085899

Change-Id: Ife99faeb5ecd6aa9fd588dcfdb0580c6ad29028c
 2021-07-01 04:51:47 +00:00