A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-09 13:49:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

msm: camera: fd: Add balanced dynamic allocation for free in init

Browse source 
The work data passed as payload to workq is statically allocated,
which has kfree call during destroy, this fails during component
unbind. Change allocation of work data to dynamic in fd hw manager.

CRs-Fixed: 2584631
Change-Id: I0cd2a152d39793ce620e9a9fc2950ee91cefe6bf
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
This commit is contained in:
Mukund Madhusudan Atre 2020-02-26 16:51:56 -08:00
commit 85aae7fa2c
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
drivers/cam_fd/fd_hw_mgr/cam_fd_hw_mgr.c
View file

@ -2053,6 +2053,9 @@ int cam_fd_hw_mgr_init(struct device_node *of_node,
goto detach_smmu;
}
g_fd_hw_mgr.work_data = kcalloc(CAM_FD_WORKQ_NUM_TASK,
sizeof(struct cam_fd_mgr_work_data), GFP_KERNEL);
for (i = 0; i < CAM_FD_WORKQ_NUM_TASK; i++)
g_fd_hw_mgr.work->task.pool[i].payload =
&g_fd_hw_mgr.work_data[i];

2
drivers/cam_fd/fd_hw_mgr/cam_fd_hw_mgr.h
View file

@ -180,7 +180,7 @@ struct cam_fd_hw_mgr {
struct cam_fd_hw_mgr_ctx ctx_pool[CAM_CTX_MAX];
struct cam_fd_mgr_frame_request frame_req[CAM_CTX_REQ_MAX];
struct cam_req_mgr_core_workq *work;
struct cam_fd_mgr_work_data work_data[CAM_FD_WORKQ_NUM_TASK];
struct cam_fd_mgr_work_data *work_data;
struct cam_fd_query_cap_cmd fd_caps;
};