Skip to content

Commit

Permalink
msm: camera: eeprom: Add OOB read check for eeprom memory map
Browse files Browse the repository at this point in the history
Add check to prevent OOB read of eeprom memory map.

Change-Id: Ifeeeffdc2a50536edbde5b5d755a052ace86d596
CRs-Fixed: 3003049
Signed-off-by: Shravan Nevatia <[email protected]>
  • Loading branch information
Shravan Nevatia authored and Sridhar Gujje committed Apr 13, 2022
1 parent d9fc57e commit c487910
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions drivers/cam_sensor_module/cam_eeprom/cam_eeprom_core.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
*/

#include <linux/module.h>
Expand Down Expand Up @@ -992,7 +993,16 @@ static int32_t cam_eeprom_init_pkt_parser(struct cam_eeprom_ctrl_t *e_ctrl,
rc = -EINVAL;
goto end;
}

if ((num_map + 1) >=
(MSM_EEPROM_MAX_MEM_MAP_CNT *
MSM_EEPROM_MEMORY_MAP_MAX_SIZE)) {
CAM_ERR(CAM_EEPROM, "OOB error");
rc = -EINVAL;
goto end;
}
/* Configure the following map slave address */

map[num_map + 1].saddr = i2c_info->slave_addr;
rc = cam_eeprom_update_slaveInfo(e_ctrl,
cmd_buf);
Expand Down

0 comments on commit c487910

Please sign in to comment.