diff options
| author | Chong Zhang <chz@google.com> | 2015-04-27 18:38:17 -0700 |
|---|---|---|
| committer | Chong Zhang <chz@google.com> | 2015-04-27 18:39:12 -0700 |
| commit | 532cd7b86a5fdc7b9a30a45d8ae2d16ef7660a72 (patch) | |
| tree | 208f06d3e06f14286cd88a695b9a6da7106c24f7 /media/libmedia/IHDCP.cpp | |
| parent | 11f88677e9a9405d2b5d7f7bf9b6eec035b6331d (diff) | |
| download | frameworks_av-532cd7b86a5fdc7b9a30a45d8ae2d16ef7660a72.zip frameworks_av-532cd7b86a5fdc7b9a30a45d8ae2d16ef7660a72.tar.gz frameworks_av-532cd7b86a5fdc7b9a30a45d8ae2d16ef7660a72.tar.bz2 | |
HDCP: buffer over flow check
bug: 20222489
Change-Id: I3a64a5999d68ea243d187f12ec7717b7f26d93a3
Diffstat (limited to 'media/libmedia/IHDCP.cpp')
| -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); |