summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaveen Leekha <leekha@google.com>2015-09-22 18:04:44 -0700
committerThe Android Automerger <android-build@google.com>2015-10-21 12:01:33 -0700
commit521c01a6d3883da50b091ee0906ead3324a3dfbb (patch)
treeea3c762d257db42854a9566506a2233cb3e502ad
parent505d9ec1ef9f43c86afca20db903300adea47717 (diff)
downloadnative-lollipop-mr1-fi-release.tar.gz
Initialize local variables to avoid data leakandroid-5.1.1_r29lollipop-mr1-fi-release
The uninitialized local variables pick up whatever the memory content was there on stack. This data gets sent to the remote process in case of a failed transaction, which is a security issue. Fixed. (Partial manual merge of master change 12ba0f57d028a9c8f4eb3afddc326b70677d1e0c. Rest to automerge from klp-dev) For b/23696300 Change-Id: I704c9fab327b3545c58e8a9a96ac542eb7469c2a
-rw-r--r--libs/gui/IGraphicBufferProducer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/gui/IGraphicBufferProducer.cpp b/libs/gui/IGraphicBufferProducer.cpp
index 75c7cfc6dc..4f7b0d30e4 100644
--- a/libs/gui/IGraphicBufferProducer.cpp
+++ b/libs/gui/IGraphicBufferProducer.cpp
@@ -344,7 +344,7 @@ status_t BnGraphicBufferProducer::onTransact(
CHECK_INTERFACE(IGraphicBufferProducer, data, reply);
sp<GraphicBuffer> buffer = new GraphicBuffer();
data.read(*buffer.get());
- int slot;
+ int slot = 0;
int result = attachBuffer(&slot, buffer);
reply->writeInt32(slot);
reply->writeInt32(result);