Merge "msm: sensor: Fix for variable being de-referenced without proper check" (33f41065) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/media/platform/msm/ais/sensor/flash/msm_flash.c

+12 −5

Original line number	Diff line number	Diff line
		@@ -152,6 +152,13 @@ static int32_t msm_flash_i2c_write_table(
		conf_array.reg_setting = settings->reg_setting_a;
		conf_array.size = settings->size;

		/* Validate the settings size */
		if ((!conf_array.size) \|\| (conf_array.size > MAX_I2C_REG_SET)) {
		pr_err("failed: invalid size %d", conf_array.size);
		return -EINVAL;
		}


		return flash_ctrl->flash_i2c_client.i2c_func_tbl->i2c_write_table(
		&flash_ctrl->flash_i2c_client, &conf_array);
		}
		@@ -1044,13 +1051,13 @@ static long msm_flash_subdev_do_ioctl(
		sd = vdev_to_v4l2_subdev(vdev);
		u32 = (struct msm_flash_cfg_data_t32 *)arg;

		switch (cmd) {
		case VIDIOC_MSM_FLASH_CFG32:
		flash_data.cfg_type = u32->cfg_type;
		for (i = 0; i < MAX_LED_TRIGGERS; i++) {
		flash_data.flash_current[i] = u32->flash_current[i];
		flash_data.flash_duration[i] = u32->flash_duration[i];
		}
		switch (cmd) {
		case VIDIOC_MSM_FLASH_CFG32:
		cmd = VIDIOC_MSM_FLASH_CFG;
		switch (flash_data.cfg_type) {
		case CFG_FLASH_OFF:

+1 −2

Original line number	Diff line number	Diff line
		@@ -780,11 +780,11 @@ static long msm_ois_subdev_do_ioctl(
		u32 = (struct msm_ois_cfg_data32 *)arg;
		parg = arg;

		ois_data.cfgtype = u32->cfgtype;

		switch (cmd) {
		case VIDIOC_MSM_OIS_CFG32:
		cmd = VIDIOC_MSM_OIS_CFG;
		ois_data.cfgtype = u32->cfgtype;

		switch (u32->cfgtype) {
		case CFG_OIS_CONTROL:
		@@ -818,7 +818,6 @@ static long msm_ois_subdev_do_ioctl(
		settings.reg_setting =
		compat_ptr(settings32.reg_setting);

		ois_data.cfgtype = u32->cfgtype;
		ois_data.cfg.settings = &settings;
		parg = &ois_data;
		break;