diff options
| author | Chong Zhang <chz@google.com> | 2015-05-14 23:38:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-14 23:38:05 +0000 |
| commit | 1181db0dc7207c18b11fb41d5d985999617a23e0 (patch) | |
| tree | 572c13f0df560b402dcd8346917ca3d2c72e30a0 /media/libmedia | |
| parent | 0eb7c79398ef04e457c76f117feef6d7bcbbc684 (diff) | |
| parent | a6e9dd941a3055526f6e967017e91a76c153087a (diff) | |
| download | frameworks_av-1181db0dc7207c18b11fb41d5d985999617a23e0.zip frameworks_av-1181db0dc7207c18b11fb41d5d985999617a23e0.tar.gz frameworks_av-1181db0dc7207c18b11fb41d5d985999617a23e0.tar.bz2 | |
am a6e9dd94: am 270caf9a: am 23d41fb1: am 2a9ccb66: am fd3a6e71: HDCP: buffer over flow check -- DO NOT MERGE
* commit 'a6e9dd941a3055526f6e967017e91a76c153087a':
HDCP: buffer over flow check -- DO NOT MERGE
Diffstat (limited to 'media/libmedia')
| -rw-r--r-- | media/libmedia/IHDCP.cpp | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/media/libmedia/IHDCP.cpp b/media/libmedia/IHDCP.cpp index 9122f75..79944ee 100644 --- a/media/libmedia/IHDCP.cpp +++ b/media/libmedia/IHDCP.cpp @@ -241,8 +241,19 @@ status_t BnHDCP::onTransact( case HDCP_ENCRYPT: { size_t size = data.readInt32(); + size_t bufSize = 2 * size; + + // watch out for overflow + void *inData = NULL; + if (bufSize > size) { + inData = malloc(bufSize); + } + + if (inData == NULL) { + reply->writeInt32(ERROR_OUT_OF_RANGE); + return OK; + } - void *inData = malloc(2 * size); void *outData = (uint8_t *)inData + size; data.read(inData, size); @@ -295,8 +306,19 @@ status_t BnHDCP::onTransact( case HDCP_DECRYPT: { size_t size = data.readInt32(); + size_t bufSize = 2 * size; + + // watch out for overflow + void *inData = NULL; + if (bufSize > size) { + inData = malloc(bufSize); + } + + if (inData == NULL) { + reply->writeInt32(ERROR_OUT_OF_RANGE); + return OK; + } - void *inData = malloc(2 * size); void *outData = (uint8_t *)inData + size; data.read(inData, size); |