mawei/onepilot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

camerad: zero memory before returning from MemoryManager::alloc (#30781)

Browse Source 
* zero memory

* remove redundant memset

---------

Co-authored-by: Comma Device <device@comma.ai>
old-commit-hash: b9080d23627849aafc4969d39df50cc615ffecdf
This commit is contained in:
Dean Lee
2023-12-19 05:54:11 +08:00
committed by GitHub
parent 6ae3e95542
commit cbbbaf22b7
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
system/camerad/cameras/camera_qcom2.cc
View File

@@ -135,7 +135,6 @@ int CameraState::sensors_init() {
buf_desc[1].size = buf_desc[1].length = 196; buf_desc[1].size = buf_desc[1].length = 196;
buf_desc[1].type = CAM_CMD_BUF_I2C; 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); 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 // power on
struct cam_cmd_power *power = power_settings.get(); struct cam_cmd_power *power = power_settings.get();

3
system/camerad/cameras/camera_util.cc
View File

@@ -1,5 +1,7 @@
#include "system/camerad/cameras/camera_util.h" #include "system/camerad/cameras/camera_util.h"
#include <string.h>
#include <cassert> #include <cassert>
#include <sys/ioctl.h> #include <sys/ioctl.h>
@@ -111,6 +113,7 @@ void *MemoryManager::alloc_buf(int size, uint32_t *handle) {
size_lookup[ptr] = size; size_lookup[ptr] = size;
} }
lock.unlock(); lock.unlock();
memset(ptr, 0, size);
return ptr; return ptr;
} }