diff options
| author | Chong Zhang <chz@google.com> | 2015-05-14 23:24:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-14 23:24:25 +0000 |
| commit | a6e9dd941a3055526f6e967017e91a76c153087a (patch) | |
| tree | 911d816947d64fcca77c513f83a87259390ea72c /media/libmedia | |
| parent | b5fbb81157eaab594bb37275176a0a178098dc46 (diff) | |
| parent | 270caf9aecf19c73d8cf94e985fb3fb089eac04c (diff) | |
| download | frameworks_av-a6e9dd941a3055526f6e967017e91a76c153087a.zip frameworks_av-a6e9dd941a3055526f6e967017e91a76c153087a.tar.gz frameworks_av-a6e9dd941a3055526f6e967017e91a76c153087a.tar.bz2 | |
am 270caf9a: am 23d41fb1: am 2a9ccb66: am fd3a6e71: HDCP: buffer over flow check -- DO NOT MERGE
* commit '270caf9aecf19c73d8cf94e985fb3fb089eac04c':
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 1cf987a..9d93320 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); |