From cbbbaf22b7a41855352e7b285d22f79999d4369f Mon Sep 17 00:00:00 2001
From: Dean Lee <deanlee3@gmail.com>
Date: Tue, 19 Dec 2023 05:54:11 +0800
Subject: [PATCH]  camerad: zero memory before returning from
 MemoryManager::alloc  (#30781)

* zero memory

* remove redundant memset

---------

Co-authored-by: Comma Device <device@comma.ai>
old-commit-hash: b9080d23627849aafc4969d39df50cc615ffecdf
---
 system/camerad/cameras/camera_qcom2.cc | 1 -
 system/camerad/cameras/camera_util.cc  | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/system/camerad/cameras/camera_qcom2.cc b/system/camerad/cameras/camera_qcom2.cc
index afb7805d3e..7915ad21fc 100644
--- a/system/camerad/cameras/camera_qcom2.cc
+++ b/system/camerad/cameras/camera_qcom2.cc
@@ -135,7 +135,6 @@ int CameraState::sensors_init() {
   buf_desc[1].size = buf_desc[1].length = 196;
   buf_desc[1].type = CAM_CMD_BUF_I2C;
   auto power_settings = mm.alloc<struct cam_cmd_power>(buf_desc[1].size, (uint32_t*)&buf_desc[1].mem_handle);
-  memset(power_settings.get(), 0, buf_desc[1].size);
 
   // power on
   struct cam_cmd_power *power = power_settings.get();
diff --git a/system/camerad/cameras/camera_util.cc b/system/camerad/cameras/camera_util.cc
index b2cf4115dc..4fe38997ce 100644
--- a/system/camerad/cameras/camera_util.cc
+++ b/system/camerad/cameras/camera_util.cc
@@ -1,5 +1,7 @@
 #include "system/camerad/cameras/camera_util.h"
 
+#include <string.h>
+
 #include <cassert>
 
 #include <sys/ioctl.h>
@@ -111,6 +113,7 @@ void *MemoryManager::alloc_buf(int size, uint32_t *handle) {
     size_lookup[ptr] = size;
   }
   lock.unlock();
+  memset(ptr, 0, size);
   return ptr;
 }