diff options
| author | Chong Zhang <chz@google.com> | 2015-05-14 23:00:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-14 23:00:51 +0000 |
| commit | 23d41fb11de0a5acb12733f7cd8875ea06d99eb5 (patch) | |
| tree | 911d816947d64fcca77c513f83a87259390ea72c /media/libmedia | |
| parent | bcf2becf206b5d56c89bf2b43356fd7995003302 (diff) | |
| parent | 2a9ccb66c052d16e870d2db1fa6edb9a39f6526b (diff) | |
| download | frameworks_av-23d41fb11de0a5acb12733f7cd8875ea06d99eb5.zip frameworks_av-23d41fb11de0a5acb12733f7cd8875ea06d99eb5.tar.gz frameworks_av-23d41fb11de0a5acb12733f7cd8875ea06d99eb5.tar.bz2 | |
am 2a9ccb66: am fd3a6e71: HDCP: buffer over flow check -- DO NOT MERGE
* commit '2a9ccb66c052d16e870d2db1fa6edb9a39f6526b':
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); |