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

Commit 57104f6c authored by Jigarkumar Zala's avatar Jigarkumar Zala Committed by Vishalsingh Hajeri
Browse files

msm: camera: Add handle check for camera sensor modules 



Add handle check for data coming from user space for camera sensor
modules.

Change-Id: Id5b447817646dc0d7718e5efaabfabdbbbeeacd6
Signed-off-by: default avatarJigarkumar Zala <jzala@codeaurora.org>
Signed-off-by: default avatarVishalsingh Hajeri <vhajeri@codeaurora.org>
parent 0bb03714

drivers/media/platform/msm/camera/cam_sensor_module/cam_actuator/cam_actuator_core.c

+7 −0
Original line number Diff line number Diff line
@@ -636,6 +636,12 @@ int32_t cam_actuator_driver_cmd(struct cam_actuator_ctrl_t *a_ctrl, 
		return -EINVAL;

	}



	if (cmd->handle_type != CAM_HANDLE_USER_POINTER) {

		CAM_ERR(CAM_ACTUATOR, "Invalid handle type: %d",

			cmd->handle_type);

		return -EINVAL;

	}



	CAM_DBG(CAM_ACTUATOR, "Opcode to Actuator: %d", cmd->op_code);



	mutex_lock(&(a_ctrl->actuator_mutex));
@@ -769,6 +775,7 @@ int32_t cam_actuator_driver_cmd(struct cam_actuator_ctrl_t *a_ctrl, 
		rc = cam_actuator_i2c_pkt_parse(a_ctrl, arg);

		if (rc < 0) {

			CAM_ERR(CAM_ACTUATOR, "Failed in actuator Parsing");

			goto release_mutex;

		}



		if (a_ctrl->setting_apply_state ==

drivers/media/platform/msm/camera/cam_sensor_module/cam_csiphy/cam_csiphy_core.c

+6 −0
Original line number Diff line number Diff line
@@ -438,6 +438,12 @@ int32_t cam_csiphy_core_cfg(void *phy_dev, 
		return -EINVAL;

	}



	if (cmd->handle_type != CAM_HANDLE_USER_POINTER) {

		CAM_ERR(CAM_CSIPHY, "Invalid handle type: %d",

			cmd->handle_type);

		return -EINVAL;

	}



	CAM_DBG(CAM_CSIPHY, "Opcode received: %d", cmd->op_code);

	mutex_lock(&csiphy_dev->mutex);

	switch (cmd->op_code) {

drivers/media/platform/msm/camera/cam_sensor_module/cam_eeprom/cam_eeprom_core.c

+9 −8
Original line number Diff line number Diff line 
/* Copyright (c) 2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -707,11 +707,6 @@ static int32_t cam_eeprom_pkt_parse(struct cam_eeprom_ctrl_t *e_ctrl, void *arg) 


	ioctl_ctrl = (struct cam_control *)arg;



	if (ioctl_ctrl->handle_type != CAM_HANDLE_USER_POINTER) {

		CAM_ERR(CAM_EEPROM, "Invalid Handle Type");

		return -EINVAL;

	}



	if (copy_from_user(&dev_config, (void __user *) ioctl_ctrl->handle,

		sizeof(dev_config)))

		return -EFAULT;
@@ -852,8 +847,14 @@ int32_t cam_eeprom_driver_cmd(struct cam_eeprom_ctrl_t *e_ctrl, void *arg) 
	struct cam_eeprom_query_cap_t  eeprom_cap = {0};

	struct cam_control            *cmd = (struct cam_control *)arg;



	if (!e_ctrl) {

		CAM_ERR(CAM_EEPROM, "e_ctrl is NULL");

	if (!e_ctrl || !cmd) {

		CAM_ERR(CAM_EEPROM, "Invalid Arguments");

		return -EINVAL;

	}



	if (cmd->handle_type != CAM_HANDLE_USER_POINTER) {

		CAM_ERR(CAM_EEPROM, "Invalid handle type: %d",

			cmd->handle_type);

		return -EINVAL;

	}

drivers/media/platform/msm/camera/cam_sensor_module/cam_flash/cam_flash_dev.c

+6 −0
Original line number Diff line number Diff line
@@ -29,6 +29,12 @@ static int32_t cam_flash_driver_cmd(struct cam_flash_ctrl *fctrl, 
		return -EINVAL;

	}



	if (cmd->handle_type != CAM_HANDLE_USER_POINTER) {

		CAM_ERR(CAM_FLASH, "Invalid handle type: %d",

			cmd->handle_type);

		return -EINVAL;

	}



	mutex_lock(&(fctrl->flash_mutex));

	switch (cmd->op_code) {

	case CAM_ACQUIRE_DEV: {

drivers/media/platform/msm/camera/cam_sensor_module/cam_ois/cam_ois_core.c

+8 −2
Original line number Diff line number Diff line
@@ -672,8 +672,14 @@ int cam_ois_driver_cmd(struct cam_ois_ctrl_t *o_ctrl, void *arg) 
	struct cam_ois_query_cap_t     ois_cap = {0};

	struct cam_control            *cmd = (struct cam_control *)arg;



	if (!o_ctrl) {

		CAM_ERR(CAM_OIS, "e_ctrl is NULL");

	if (!o_ctrl || !arg) {

		CAM_ERR(CAM_OIS, "Invalid arguments");

		return -EINVAL;

	}



	if (cmd->handle_type != CAM_HANDLE_USER_POINTER) {

		CAM_ERR(CAM_OIS, "Invalid handle type: %d",

			cmd->handle_type);

		return -EINVAL;

	}