widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,099 Commits 2 Branches 0 Tags
22695031292d8d6791b0d8a4f4168036079f94db
Commit Graph

6099 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cong Lin
74a17c47f7 [automerger skipped] [RESTRICT AUTOMERGE] Clear mmapped page before releasing and re-generate am: 48cc1e57b8 -s ours am: 973140383a -s ours am: 7435874685 -s ours 
am skip reason: subject contains skip directive

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

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

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

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

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

Change-Id: I1e31f15c5b16f43367f1e9b72b2fce6f484cd76a
 2021-07-13 22:03:54 +00:00
Edwin Wong
4f4a2af69c [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: e9f480cf2b -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: I244235360cd057feb8986d07feaa05cf6d4eac27
 2021-07-13 22:03:42 +00:00
Edwin Wong
2cdf1cf43e [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt destPtr overflow. am: 1bd967f9a8 -s ours am: 7752248af7 -s ours am: c4600c0f7d -s ours am: 9d02914fd7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4fbbd469369c9bc8e4eb7c6c06797b5680506ff8
 2021-07-13 22:03:21 +00:00
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
Alex Dale
78278c3eb4 Correctly record license service version in metrics. 
[ Merge of http://go/wvgerrit/128683 ]

The CDM session was incorrectly recording the "license SDK version" as
the "license service version" in the session metrics.  This
discrepancy reduces the quality of devices' metrics and limits
debugging capabilities for the Widevine metric monitoring services.

Bug: 193177333
Test: Linux unit tests
Change-Id: Ic58cf7bc4fde777bb590c05777b76f5ff5c2f1ea
 2021-07-09 19:25:14 +00:00
Robert Shih
60f3653f94 Add 1.3 widevine hidl target am: 20b7762982 am: 127b7c6e13 am: 18f9235141 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15191998

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

Change-Id: If90edd53284c04c3aa3c9189b828b856e63270e1
 2021-07-07 20:39:18 +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
bf98f880d4 Add 1.3 widevine hidl target am: 20b7762982 am: 233c4bd3b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15191998

Change-Id: I1f885760089a9213f5c7e07ee5a2cb5d3d6ca0eb
 2021-07-07 20:17:28 +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
233c4bd3b2 Add 1.3 widevine hidl target am: 20b7762982 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15191998

Change-Id: I6a2c60d9c4aa15b3c331c2996e675f396f201438
 2021-07-07 20:02:39 +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
63045dfbca Added write protection for session to engine map. am: b6cdd12394 am: f17153dfb1 am: 7a026dfb02 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15180882

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

Change-Id: I3747f52437613560492da45c70d92f686ed1bd83
 2021-07-02 17:16:40 +00: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
4d8bc8ff51 Added write protection for session to engine map. am: b6cdd12394 am: 24697f9301 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15180882

Change-Id: I3dc869e6cf9ed07816fb70f96ae89ae1211b5ff0
 2021-07-02 17:07:05 +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
24697f9301 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: I41e30a806afe31c16c8a4597eff156107256d86a
 2021-07-02 16:58:25 +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
5f89ef9852 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix L3 clock loading issue" into sc-v2-dev am: bb62a534bf am: 54c00460d3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I54ffedd68950a3ba36d99401431cd6bae9a64af0
 2021-07-02 00:00:25 +00:00
Cong Lin
3e23e4b618 [automerger skipped] [RESTRICT AUTOMERGE] Fix L3 clock loading issue am: e98c9150df am: 75495dff9a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ide77fed52a6a7a6b131b2fd18bc666cbe0bd18ba
 2021-07-02 00:00:23 +00: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
89313f6cc9 Merge "Disable expiration for legacy DRM certificates" into sc-dev am: a3657ab200 am: 48cc9dccc9 am: 17414e43a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15144680

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

Change-Id: Iab0281017e2ed2bbefe6b643dc9245eec19f935d
 2021-07-01 21:30:48 +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
dd72a8179a Merge "Disable expiration for legacy DRM certificates" into sc-dev am: a3657ab200 am: 9fe7626938 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/15144680

Change-Id: I41b02cb18a2193fda1e002c06629aa34df2c30c9
 2021-07-01 21:18:13 +00:00