samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "msm: camera: common: Fix NULL pointer dereference" into camera-kernel.lnx.5.0

Browse Source
This commit is contained in:
Camera Software Integration
2021-04-28 21:20:01 -07:00
committed by Gerrit - the friendly Code Review server
parent 1ef64946ef 5992dd4885
commit 625981cd2e
4 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/cam_isp/isp_hw_mgr/hw_utils/irq_controller/cam_irq_controller.c
View File

@@ -111,6 +111,11 @@ int cam_irq_controller_deinit(void **irq_controller)
struct cam_irq_controller *controller = *irq_controller; struct cam_irq_controller *controller = *irq_controller;
struct cam_irq_evt_handler *evt_handler = NULL; struct cam_irq_evt_handler *evt_handler = NULL;
if (!controller) {
CAM_ERR(CAM_IRQ_CTRL, "Null Pointer");
return -EINVAL;
}
while (!list_empty(&controller->evt_handler_list_head)) { while (!list_empty(&controller->evt_handler_list_head)) {
evt_handler = list_first_entry( evt_handler = list_first_entry(
&controller->evt_handler_list_head, &controller->evt_handler_list_head,

3
drivers/cam_req_mgr/cam_req_mgr_debug.c
View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* Copyright (c) 2016-2020, The Linux Foundation. All rights reserved. * Copyright (c) 2016-2021, The Linux Foundation. All rights reserved.
*/ */
#include "cam_req_mgr_debug.h" #include "cam_req_mgr_debug.h"
@@ -147,6 +147,7 @@ end:
int cam_req_mgr_debug_unregister(void) int cam_req_mgr_debug_unregister(void)
{ {
debugfs_remove_recursive(debugfs_root); debugfs_remove_recursive(debugfs_root);
debugfs_root = NULL;
return 0; return 0;
} }

3
drivers/cam_sensor_module/cam_cci/cam_cci_dev.c
View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* Copyright (c) 2017-2020, The Linux Foundation. All rights reserved. * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
*/ */
#include "cam_cci_dev.h" #include "cam_cci_dev.h"
@@ -548,6 +548,7 @@ static void cam_cci_component_unbind(struct device *dev,
cam_cpas_unregister_client(cci_dev->cpas_handle); cam_cpas_unregister_client(cci_dev->cpas_handle);
debugfs_remove_recursive(debugfs_root); debugfs_remove_recursive(debugfs_root);
debugfs_root = NULL;
cam_cci_soc_remove(pdev, cci_dev); cam_cci_soc_remove(pdev, cci_dev);
rc = cam_unregister_subdev(&(cci_dev->v4l2_dev_str)); rc = cam_unregister_subdev(&(cci_dev->v4l2_dev_str));
if (rc < 0) if (rc < 0)

5
drivers/cam_sensor_module/cam_res_mgr/cam_res_mgr.c
View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* Copyright (c) 2017-2020, The Linux Foundation. All rights reserved. * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
*/ */
#include <linux/init.h> #include <linux/init.h>
@@ -932,7 +932,8 @@ static void cam_res_mgr_component_unbind(struct device *dev,
{ {
if (cam_res) { if (cam_res) {
cam_res_mgr_free_res(); cam_res_mgr_free_res();
devm_pinctrl_put(cam_res->pinctrl); if (cam_res->pinctrl)
devm_pinctrl_put(cam_res->pinctrl);
cam_res->pinctrl = NULL; cam_res->pinctrl = NULL;
cam_res->pstatus = PINCTRL_STATUS_PUT; cam_res->pstatus = PINCTRL_STATUS_PUT;
kfree(cam_res); kfree(cam_res);