diff options
author | android-build-team Robot | 2017-12-14 15:22:39 -0600 |
---|---|---|
committer | android-build-team Robot | 2017-12-14 15:22:39 -0600 |
commit | 7de62777a0cd81c067c60032a9ed0a240f6fbe36 (patch) | |
tree | efd8ebb3dcb0d4d3ff62da4f43f425f1f3e80602 | |
parent | 3d522614ec13d9d3911a81789c6776332b82cb43 (diff) | |
parent | d6e8f9d5b9dca4d378a7519da77013a8f27b5ae8 (diff) | |
download | platform-hardware-interfaces-android-8.1.0_r15.tar.gz platform-hardware-interfaces-android-8.1.0_r15.tar.xz platform-hardware-interfaces-android-8.1.0_r15.zip |
Merge cherrypicks of [3365569, 3365570, 3366860, 3366878, 3365571, 3365572, 3366918, 3365573, 3365589, 3365590, 3366938, 3366902, 3365574, 3365575, 3365576, 3365577, 3366958, 3365824, 3365591, 3366959, 3366960, 3366961, 3366962, 3366963, 3366964, 3366965, 3366919, 3366966, 3366967, 3366968, 3366969, 3366970, 3367018, 3367019, 3365592, 3365593, 3366985, 3365825, 3366988, 3366989, 3366990, 3366991, 3366992, 3366993, 3366994, 3367004, 3367005, 3367006, 3367007, 3367008, 3367009, 3367010, 3367011, 3367012, 3367013, 3367014, 3367015, 3367016, 3367017, 3367038, 3367039, 3367040, 3367041, 3367042, 3367044, 3367045, 3367046, 3367049, 3367050, 3367052, 3367053, 3367054, 3367055, 3367056, 3366920, 3366921, 3366922, 3367079] into oc-mr1-releaseandroid-wear-8.1.0_r1android-8.1.0_r19android-8.1.0_r16android-8.1.0_r15android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10oreo-mr1-release
Change-Id: I41e81da8c61c5c0a7a50749f23e55611a1efd33a
-rw-r--r-- | cas/1.0/default/DescramblerImpl.cpp | 53 |
1 files changed, 52 insertions, 1 deletions
diff --git a/cas/1.0/default/DescramblerImpl.cpp b/cas/1.0/default/DescramblerImpl.cpp index 3d90809c..36699baf 100644 --- a/cas/1.0/default/DescramblerImpl.cpp +++ b/cas/1.0/default/DescramblerImpl.cpp | |||
@@ -18,8 +18,9 @@ | |||
18 | #define LOG_TAG "android.hardware.cas@1.0-DescramblerImpl" | 18 | #define LOG_TAG "android.hardware.cas@1.0-DescramblerImpl" |
19 | 19 | ||
20 | #include <hidlmemory/mapping.h> | 20 | #include <hidlmemory/mapping.h> |
21 | #include <media/hardware/CryptoAPI.h> | ||
22 | #include <media/cas/DescramblerAPI.h> | 21 | #include <media/cas/DescramblerAPI.h> |
22 | #include <media/hardware/CryptoAPI.h> | ||
23 | #include <media/stagefright/foundation/AUtils.h> | ||
23 | #include <utils/Log.h> | 24 | #include <utils/Log.h> |
24 | 25 | ||
25 | #include "DescramblerImpl.h" | 26 | #include "DescramblerImpl.h" |
@@ -70,6 +71,11 @@ Return<bool> DescramblerImpl::requiresSecureDecoderComponent( | |||
70 | return mPlugin->requiresSecureDecoderComponent(String8(mime.c_str())); | 71 | return mPlugin->requiresSecureDecoderComponent(String8(mime.c_str())); |
71 | } | 72 | } |
72 | 73 | ||
74 | static inline bool validateRangeForSize( | ||
75 | uint64_t offset, uint64_t length, uint64_t size) { | ||
76 | return isInRange<uint64_t, uint64_t>(0, size, offset, length); | ||
77 | } | ||
78 | |||
73 | Return<void> DescramblerImpl::descramble( | 79 | Return<void> DescramblerImpl::descramble( |
74 | ScramblingControl scramblingControl, | 80 | ScramblingControl scramblingControl, |
75 | const hidl_vec<SubSample>& subSamples, | 81 | const hidl_vec<SubSample>& subSamples, |
@@ -81,12 +87,57 @@ Return<void> DescramblerImpl::descramble( | |||
81 | ALOGV("%s", __FUNCTION__); | 87 | ALOGV("%s", __FUNCTION__); |
82 | 88 | ||
83 | sp<IMemory> srcMem = mapMemory(srcBuffer.heapBase); | 89 | sp<IMemory> srcMem = mapMemory(srcBuffer.heapBase); |
90 | |||
91 | // Validate if the offset and size in the SharedBuffer is consistent with the | ||
92 | // mapped ashmem, since the offset and size is controlled by client. | ||
93 | if (srcMem == NULL) { | ||
94 | ALOGE("Failed to map src buffer."); | ||
95 | _hidl_cb(toStatus(BAD_VALUE), 0, NULL); | ||
96 | return Void(); | ||
97 | } | ||
98 | if (!validateRangeForSize( | ||
99 | srcBuffer.offset, srcBuffer.size, (uint64_t)srcMem->getSize())) { | ||
100 | ALOGE("Invalid src buffer range: offset %llu, size %llu, srcMem size %llu", | ||
101 | srcBuffer.offset, srcBuffer.size, (uint64_t)srcMem->getSize()); | ||
102 | android_errorWriteLog(0x534e4554, "67962232"); | ||
103 | _hidl_cb(toStatus(BAD_VALUE), 0, NULL); | ||
104 | return Void(); | ||
105 | } | ||
106 | |||
107 | // use 64-bit here to catch bad subsample size that might be overflowing. | ||
108 | uint64_t totalBytesInSubSamples = 0; | ||
109 | for (size_t i = 0; i < subSamples.size(); i++) { | ||
110 | totalBytesInSubSamples += (uint64_t)subSamples[i].numBytesOfClearData + | ||
111 | subSamples[i].numBytesOfEncryptedData; | ||
112 | } | ||
113 | // Further validate if the specified srcOffset and requested total subsample size | ||
114 | // is consistent with the source shared buffer size. | ||
115 | if (!validateRangeForSize(srcOffset, totalBytesInSubSamples, srcBuffer.size)) { | ||
116 | ALOGE("Invalid srcOffset and subsample size: " | ||
117 | "srcOffset %llu, totalBytesInSubSamples %llu, srcBuffer size %llu", | ||
118 | srcOffset, totalBytesInSubSamples, srcBuffer.size); | ||
119 | android_errorWriteLog(0x534e4554, "67962232"); | ||
120 | _hidl_cb(toStatus(BAD_VALUE), 0, NULL); | ||
121 | return Void(); | ||
122 | } | ||
123 | |||
84 | void *srcPtr = (uint8_t *)(void *)srcMem->getPointer() + srcBuffer.offset; | 124 | void *srcPtr = (uint8_t *)(void *)srcMem->getPointer() + srcBuffer.offset; |
85 | void *dstPtr = NULL; | 125 | void *dstPtr = NULL; |
86 | if (dstBuffer.type == BufferType::SHARED_MEMORY) { | 126 | if (dstBuffer.type == BufferType::SHARED_MEMORY) { |
87 | // When using shared memory, src buffer is also used as dst, | 127 | // When using shared memory, src buffer is also used as dst, |
88 | // we don't map it again here. | 128 | // we don't map it again here. |
89 | dstPtr = srcPtr; | 129 | dstPtr = srcPtr; |
130 | |||
131 | // In this case the dst and src would be the same buffer, need to validate | ||
132 | // dstOffset against the buffer size too. | ||
133 | if (!validateRangeForSize(dstOffset, totalBytesInSubSamples, srcBuffer.size)) { | ||
134 | ALOGE("Invalid dstOffset and subsample size: " | ||
135 | "dstOffset %llu, totalBytesInSubSamples %llu, srcBuffer size %llu", | ||
136 | dstOffset, totalBytesInSubSamples, srcBuffer.size); | ||
137 | android_errorWriteLog(0x534e4554, "67962232"); | ||
138 | _hidl_cb(toStatus(BAD_VALUE), 0, NULL); | ||
139 | return Void(); | ||
140 | } | ||
90 | } else { | 141 | } else { |
91 | native_handle_t *handle = const_cast<native_handle_t *>( | 142 | native_handle_t *handle = const_cast<native_handle_t *>( |
92 | dstBuffer.secureMemory.getNativeHandle()); | 143 | dstBuffer.secureMemory.getNativeHandle()); |