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

Merge "msm: camera: isp: Fix invalid type conversion"

Browse source
This commit is contained in:
Linux Build Service Account 2019-01-23 05:14:16 -08:00 • committed by Gerrit - the friendly Code Review server
commit 2c72b0a902
1 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.
/* Copyright (c) 2013-2017, 2019 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
@ -230,32 +230,34 @@ static long msm_ispif_cmd_ext(struct v4l2_subdev *sd,
long rc = 0;
struct ispif_device *ispif =
(struct ispif_device *)v4l2_get_subdevdata(sd);
struct ispif_cfg_data_ext pcdata;
struct ispif_cfg_data_ext pcdata = {0};
struct msm_ispif_param_data_ext *params = NULL;
if (is_compat_task()) {
#ifdef CONFIG_COMPAT
struct ispif_cfg_data_ext_32 *pcdata32 =
(struct ispif_cfg_data_ext_32 *)arg;
struct ispif_cfg_data_ext_32 *pcdata32 =
(struct ispif_cfg_data_ext_32 *)arg;
if (pcdata32 == NULL) {
pr_err("Invalid params passed from user\n");
return -EINVAL;
}
pcdata.cfg_type = pcdata32->cfg_type;
pcdata.size = pcdata32->size;
pcdata.data = compat_ptr(pcdata32->data);
#else
struct ispif_cfg_data_ext *pcdata64 =
if (pcdata32 == NULL) {
pr_err("Invalid params passed from user\n");
return -EINVAL;
}
pcdata.cfg_type = pcdata32->cfg_type;
pcdata.size = pcdata32->size;
pcdata.data = compat_ptr(pcdata32->data);
#endif
} else {
struct ispif_cfg_data_ext *pcdata64 =
(struct ispif_cfg_data_ext *)arg;
if (pcdata64 == NULL) {
pr_err("Invalid params passed from user\n");
return -EINVAL;
if (pcdata64 == NULL) {
pr_err("Invalid params passed from user\n");
return -EINVAL;
}
pcdata.cfg_type = pcdata64->cfg_type;
pcdata.size = pcdata64->size;
pcdata.data = pcdata64->data;
}
pcdata.cfg_type = pcdata64->cfg_type;
pcdata.size = pcdata64->size;
pcdata.data = pcdata64->data;
#endif
if (pcdata.size != sizeof(struct msm_ispif_param_data_ext)) {
pr_err("%s: payload size mismatch\n", __func__);
return -EINVAL;