diff options
| author | Jeff Tinker <jtinker@google.com> | 2015-09-16 13:21:51 -0700 |
|---|---|---|
| committer | Jeff Tinker <jtinker@google.com> | 2015-09-16 15:29:58 -0700 |
| commit | 3fd87605288d6d8e5abebadbddfa6071387fecdd (patch) | |
| tree | 04793f50cb6d958042a046c56c8ba26338dc4bb8 /media/libmedia | |
| parent | b946648cc63a4d328318b56215214ead575bc54a (diff) | |
| download | frameworks_av-3fd87605288d6d8e5abebadbddfa6071387fecdd.zip frameworks_av-3fd87605288d6d8e5abebadbddfa6071387fecdd.tar.gz frameworks_av-3fd87605288d6d8e5abebadbddfa6071387fecdd.tar.bz2 | |
DO NOT MERGE Fix vulnerability in mediaserver
ICrypto.cpp: ASLR bypass using DECRYPT IPC
bug: 24074485
Change-Id: I61cd77f0894140547f666a80526ebfe1ec3d2db6
Diffstat (limited to 'media/libmedia')
| -rw-r--r-- | media/libmedia/ICrypto.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/ICrypto.cpp b/media/libmedia/ICrypto.cpp index 9703b0d..a398ff7 100644 --- a/media/libmedia/ICrypto.cpp +++ b/media/libmedia/ICrypto.cpp @@ -297,7 +297,7 @@ status_t BnCrypto::onTransact( if (secure) { secureBufferId = reinterpret_cast<void *>(static_cast<uintptr_t>(data.readInt64())); } else { - dstPtr = malloc(totalSize); + dstPtr = calloc(1, totalSize); } AString errorDetailMsg; |