commit f5a6fb9996387ff2feb0c77545c2f883998065a7
author Yurii Zubrytskyi <zyy@google.com> Thu Mar 18 19:29:19 2021 -0700
committer Songchun Fan <schfan@google.com> Fri Mar 19 04:26:32 2021 +0000
tree 6f3043815a3897bc5b47ca4078ecb513008cef39
parent 4375a7453574a219f446222409a567acb2d60120

[incfs] Fix the unsafe memory copy in IncrementalService

Better to protect the memcpy() and zero-out the target

Bug: 183160959
Test: atest IncrementalService
Change-Id: I3daca749168a8c5a32b1eedc7992006cbe2e9eb4

services/incremental/BinderIncrementalService.cpp

diff --git a/services/incremental/BinderIncrementalService.cpp b/services/incremental/BinderIncrementalService.cpp
index 9869b07..5e5be25 100644
--- a/services/incremental/BinderIncrementalService.cpp
+++ b/services/incremental/BinderIncrementalService.cpp
@@ -280,8 +280,8 @@
 }
 
 static FileId toFileId(const std::vector<uint8_t>& id) {
-    FileId fid;
-    memcpy(&fid, id.data(), id.size());
+    FileId fid = {};
+    memcpy(&fid, id.data(), std::min(sizeof(fid), id.size()));
     return fid;
 }