diff options
| author | Chong Zhang <chz@google.com> | 2015-04-27 18:38:17 -0700 |
|---|---|---|
| committer | Chong Zhang <chz@google.com> | 2015-05-14 21:54:54 +0000 |
| commit | dbe6c320b414d8139c46aaf880d5f154ef4f9af8 (patch) | |
| tree | 9da4023f106ea43c20ec91d39406c799420f35db /media/libmedia | |
| parent | 7acac10aae34da5ae4d628c5a270e7e3e94f7598 (diff) | |
| download | frameworks_av-dbe6c320b414d8139c46aaf880d5f154ef4f9af8.zip frameworks_av-dbe6c320b414d8139c46aaf880d5f154ef4f9af8.tar.gz frameworks_av-dbe6c320b414d8139c46aaf880d5f154ef4f9af8.tar.bz2 | |
HDCP: buffer over flow check -- DO NOT MERGE
bug: 20222489
Change-Id: I3a64a5999d68ea243d187f12ec7717b7f26d93a3
(cherry picked from commit 532cd7b86a5fdc7b9a30a45d8ae2d16ef7660a72)
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); |