From f5a6fb9996387ff2feb0c77545c2f883998065a7 Mon Sep 17 00:00:00 2001
From: Yurii Zubrytskyi <zyy@google.com>
Date: Thu, 18 Mar 2021 19:29:19 -0700
Subject: [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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'services/incremental/BinderIncrementalService.cpp')

diff --git a/services/incremental/BinderIncrementalService.cpp b/services/incremental/BinderIncrementalService.cpp
index 9869b075b36f..5e5be2506567 100644
--- a/services/incremental/BinderIncrementalService.cpp
+++ b/services/incremental/BinderIncrementalService.cpp
@@ -280,8 +280,8 @@ binder::Status BinderIncrementalService::getMetadataByPath(int32_t storageId,
 }
 
 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;
 }
 
-- 
cgit v1.2.3-59-g8ed1b