commit b41a527176b659c5ddfc734838df7607a6af80c9
author Jeff Tinker <jtinker@google.com> Mon Oct 09 11:52:18 2017 -0700
committer Jeff Tinker <jtinker@google.com> Mon Oct 09 21:42:39 2017 -0700
tree 97f65bb081c16c90cfa5c6b38571e7102dbb6552
parent c41471f6dff4825a27e6e26a0b5b480761572849

Fix information disclosure in mediadrmserver

Test:poc provided in bug
bug:62872384
Change-Id: I3d104a2a64a0cb81e9fd5b04c4def1fbee64da2d

media/libmedia/IDrm.cpp

diff --git a/media/libmedia/IDrm.cpp b/media/libmedia/IDrm.cpp
index 1904839..b30ab85 100644
--- a/media/libmedia/IDrm.cpp
+++ b/media/libmedia/IDrm.cpp
@@ -454,8 +454,13 @@
 
 void BnDrm::readVector(const Parcel &data, Vector<uint8_t> &vector) const {
     uint32_t size = data.readInt32();
-    vector.insertAt((size_t)0, size);
-    data.read(vector.editArray(), size);
+    if (vector.insertAt((size_t)0, size) < 0) {
+        vector.clear();
+    }
+    if (data.read(vector.editArray(), size) != NO_ERROR) {
+        vector.clear();
+        android_errorWriteWithInfoLog(0x534e4554, "62872384", -1, NULL, 0);
+    }
 }
 
 void BnDrm::writeVector(Parcel *reply, Vector<uint8_t> const &vector) const {