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

msm: camera: cdm: Fix of_match table null entry

Browse Source 
global-out-of-bounds issue on:
msm_cam_hw_cdm_dt_match
Due to no null-terminating struct in the array.

CRs-Fixed: 2883523
Change-Id: I36e4811f239993e1e6de158df959157217c28bfe
Signed-off-by: Karthik Jayakumar <kjayakum@codeaurora.org>
This commit is contained in:
Karthik Jayakumar
2021-02-23 16:45:30 -08:00
parent 536d5a9599
commit 8abb54dcb1
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/cam_cdm/cam_cdm_hw_core.c
View File

@@ -75,6 +75,7 @@ static const struct of_device_id msm_cam_hw_cdm_dt_match[] = {
.compatible = CAM_HW_CDM_OPE_NAME_2_1, .compatible = CAM_HW_CDM_OPE_NAME_2_1,
.data = &cam_cdm_2_1_reg_offset, .data = &cam_cdm_2_1_reg_offset,
}, },
{},
}; };
static enum cam_cdm_id cam_hw_cdm_get_id_by_name(char *name) static enum cam_cdm_id cam_hw_cdm_get_id_by_name(char *name)

9
drivers/cam_utils/cam_compat.c
View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* Copyright (c) 2014-2020, The Linux Foundation. All rights reserved. * Copyright (c) 2014-2021, The Linux Foundation. All rights reserved.
*/ */
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
@@ -214,6 +214,7 @@ int camera_component_match_add_drivers(struct device *master_dev,
{ {
int i, rc = 0; int i, rc = 0;
struct platform_device *pdev = NULL; struct platform_device *pdev = NULL;
struct device *start_dev = NULL, *match_dev = NULL;
if (!master_dev || !match_list) { if (!master_dev || !match_list) {
CAM_ERR(CAM_UTIL, "Invalid parameters for component match add"); CAM_ERR(CAM_UTIL, "Invalid parameters for component match add");
@@ -230,14 +231,12 @@ int camera_component_match_add_drivers(struct device *master_dev,
struct device_driver *drv = &cam_component_drivers[i]->driver; struct device_driver *drv = &cam_component_drivers[i]->driver;
void *drv_ptr = (void *)drv; void *drv_ptr = (void *)drv;
#endif #endif
struct device *start_dev = NULL, *match_dev; start_dev = NULL;
while ((match_dev = bus_find_device(&platform_bus_type, while ((match_dev = bus_find_device(&platform_bus_type,
start_dev, drv_ptr, &camera_platform_compare_dev))) { start_dev, drv_ptr, &camera_platform_compare_dev))) {
put_device(start_dev); put_device(start_dev);
pdev = to_platform_device(match_dev); pdev = to_platform_device(match_dev);
CAM_DBG(CAM_UTIL, "Adding matched component:%s", CAM_DBG(CAM_UTIL, "Adding matched component:%s", pdev->name);
pdev->name);
component_match_add(master_dev, match_list, component_match_add(master_dev, match_list,
camera_component_compare_dev, match_dev); camera_component_compare_dev, match_dev);
start_dev = match_dev; start_dev = match_dev;