widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid null dereference with empty BCC strings. am: ce25b9d44c

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

Change-Id: I1afa1444f8127ce1567bf61639bf3602dd6270ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alex Dale
2023-03-22 22:22:34 +00:00
committed by Automerger Merge Worker
parent 00bac2ca3a ce25b9d44c
commit 333150ca8b
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libwvdrmengine/cdm/core/src/crypto_session.cpp
View File

@@ -202,6 +202,12 @@ size_t GenericEncryptionBlockSize(CdmEncryptionAlgorithm algorithm) {
} }
return kAes128BlockSize; return kAes128BlockSize;
} }
uint8_t* MutableStringDataPointer(std::string* s) {
if (s == nullptr) return nullptr;
if (s->empty()) return nullptr;
return reinterpret_cast<uint8_t*>(&s->front());
}
} // namespace } // namespace
// CryptoSession variables allocation. // CryptoSession variables allocation.
@@ -1385,18 +1391,18 @@ CdmResponseType CryptoSession::GetBootCertificateChain(
size_t bcc_length = 0; size_t bcc_length = 0;
size_t additional_signature_length = 0; size_t additional_signature_length = 0;
OEMCryptoResult sts; OEMCryptoResult sts =
WithOecReadLock("GetBootCertificateChain Attempt 1", [&] { WithOecReadLock("GetBootCertificateChain Attempt 1", [&] {
sts = OEMCrypto_GetBootCertificateChain(nullptr, &bcc_length, nullptr, return OEMCrypto_GetBootCertificateChain(nullptr, &bcc_length, nullptr,
&additional_signature_length); &additional_signature_length);
}); });
if (sts == OEMCrypto_ERROR_SHORT_BUFFER) { if (sts == OEMCrypto_ERROR_SHORT_BUFFER) {
bcc->resize(bcc_length); bcc->resize(bcc_length);
additional_signature->resize(additional_signature_length); additional_signature->resize(additional_signature_length);
WithOecReadLock("GetBootCertificateChain Attempt 2", [&] { sts = WithOecReadLock("GetBootCertificateChain Attempt 2", [&] {
sts = OEMCrypto_GetBootCertificateChain( return OEMCrypto_GetBootCertificateChain(
reinterpret_cast<uint8_t*>(&bcc->front()), &bcc_length, MutableStringDataPointer(bcc), &bcc_length,
reinterpret_cast<uint8_t*>(&additional_signature->front()), MutableStringDataPointer(additional_signature),
&additional_signature_length); &additional_signature_length);
}); });
} }
@@ -1444,11 +1450,10 @@ CdmResponseType CryptoSession::GenerateCertificateKeyPair(
WithOecSessionLock("GenerateCertificateKeyPair Attempt 2", [&] { WithOecSessionLock("GenerateCertificateKeyPair Attempt 2", [&] {
M_TIME( M_TIME(
status = OEMCrypto_GenerateCertificateKeyPair( status = OEMCrypto_GenerateCertificateKeyPair(
oec_session_id_, reinterpret_cast<uint8_t*>(&public_key->front()), oec_session_id_, MutableStringDataPointer(public_key),
&public_key_length, &public_key_length, MutableStringDataPointer(public_key_signature),
reinterpret_cast<uint8_t*>(&public_key_signature->front()),
&public_key_signature_length, &public_key_signature_length,
reinterpret_cast<uint8_t*>(&wrapped_private_key->front()), MutableStringDataPointer(wrapped_private_key),
&wrapped_private_key_length, &oemcrypto_key_type), &wrapped_private_key_length, &oemcrypto_key_type),
metrics_, oemcrypto_generate_certificate_key_pair_, status); metrics_, oemcrypto_generate_certificate_key_pair_, status);
}); });