| Revision | 7a8f757369e43a9f13f32791693ce1341ba03844 (tree) |
|---|---|
| Time | 2020-05-08 11:58:54 |
| Author | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
Merge tag 'android-8.1.0_r76' into oreo-x86
Android 8.1.0 release 76
drm/libmediadrm/ICrypto.cpp (diff) media/libmedia/IHDCP.cpp (diff)| @@ -264,8 +264,12 @@ status_t BnCrypto::onTransact( | ||
| 264 | 264 | { |
| 265 | 265 | CHECK_INTERFACE(ICrypto, data, reply); |
| 266 | 266 | |
| 267 | - uint8_t uuid[16]; | |
| 268 | - data.read(uuid, sizeof(uuid)); | |
| 267 | + uint8_t uuid[16] = {0}; | |
| 268 | + if (data.read(uuid, sizeof(uuid)) != NO_ERROR) { | |
| 269 | + android_errorWriteLog(0x534e4554, "144767096"); | |
| 270 | + reply->writeInt32(BAD_VALUE); | |
| 271 | + return OK; | |
| 272 | + } | |
| 269 | 273 | |
| 270 | 274 | size_t opaqueSize = data.readInt32(); |
| 271 | 275 | void *opaqueData = NULL; |
| @@ -280,7 +284,11 @@ status_t BnCrypto::onTransact( | ||
| 280 | 284 | return NO_MEMORY; |
| 281 | 285 | } |
| 282 | 286 | |
| 283 | - data.read(opaqueData, opaqueSize); | |
| 287 | + if (data.read(opaqueData, opaqueSize) != NO_ERROR) { | |
| 288 | + android_errorWriteLog(0x534e4554, "144767096"); | |
| 289 | + reply->writeInt32(BAD_VALUE); | |
| 290 | + return OK; | |
| 291 | + } | |
| 284 | 292 | reply->writeInt32(createPlugin(uuid, opaqueData, opaqueSize)); |
| 285 | 293 | |
| 286 | 294 | free(opaqueData); |
| @@ -333,11 +333,12 @@ status_t BnHDCP::onTransact( | ||
| 333 | 333 | |
| 334 | 334 | void *outData = (uint8_t *)inData + size; |
| 335 | 335 | |
| 336 | - data.read(inData, size); | |
| 337 | - | |
| 338 | - uint32_t streamCTR = data.readInt32(); | |
| 339 | - uint64_t inputCTR = data.readInt64(); | |
| 340 | - status_t err = decrypt(inData, size, streamCTR, inputCTR, outData); | |
| 336 | + status_t err = data.read(inData, size); | |
| 337 | + if (err == OK) { | |
| 338 | + uint32_t streamCTR = data.readInt32(); | |
| 339 | + uint64_t inputCTR = data.readInt64(); | |
| 340 | + err = decrypt(inData, size, streamCTR, inputCTR, outData); | |
| 341 | + } | |
| 341 | 342 | |
| 342 | 343 | reply->writeInt32(err); |
| 343 | 344 |
Android-x86
Fork