Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e650018e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: sensor: Validate sensor related name length"

parents 63a4b33c 4f19bb77

drivers/media/platform/msm/camera_v2/sensor/msm_sensor_driver.c

+15 −0
Original line number Diff line number Diff line
@@ -793,6 +793,21 @@ int32_t msm_sensor_driver_probe(void *setting, 
		}

	}



	if (strlen(slave_info->sensor_name) >= MAX_SENSOR_NAME ||

		strlen(slave_info->eeprom_name) >= MAX_SENSOR_NAME ||

		strlen(slave_info->actuator_name) >= MAX_SENSOR_NAME ||

		strlen(slave_info->ois_name) >= MAX_SENSOR_NAME) {

		pr_err("failed: name len greater than 32.\n");

		pr_err("sensor name len:%zu, eeprom name len: %zu.\n",

			strlen(slave_info->sensor_name),

			strlen(slave_info->eeprom_name));

		pr_err("actuator name len: %zu, ois name len:%zu.\n",

			strlen(slave_info->actuator_name),

			strlen(slave_info->ois_name));

		rc = -EINVAL;

		goto free_slave_info;

	}



	/* Print slave info */

	CDBG("camera id %d Slave addr 0x%X addr_type %d\n",

		slave_info->camera_id, slave_info->slave_addr,