evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: camera: fix untrusted pointer for power down setting"

Browse source
This commit is contained in:
Linux Build Service Account 2017-06-22 07:40:18 -07:00 • committed by Gerrit - the friendly Code Review server
commit 77a019931a
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/media/platform/msm/camera_v2/sensor/msm_sensor_driver.c
View file

@ -469,17 +469,11 @@ static int32_t msm_sensor_create_pd_settings(void *setting,
#ifdef CONFIG_COMPAT
if (is_compat_task()) {
int i = 0;
struct msm_sensor_power_setting32 *power_setting_iter =
(struct msm_sensor_power_setting32 *)compat_ptr((
(struct msm_camera_sensor_slave_info32 *)setting)->
power_setting_array.power_setting);
for (i = 0; i < size_down; i++) {
pd[i].config_val = power_setting_iter[i].config_val;
pd[i].delay = power_setting_iter[i].delay;
pd[i].seq_type = power_setting_iter[i].seq_type;
pd[i].seq_val = power_setting_iter[i].seq_val;
rc = msm_sensor_get_pw_settings_compat(
pd, pu, size_down);
if (rc < 0) {
pr_err("failed");
return -EFAULT;
}
} else
#endif