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

Merge "msm: camera: cpp: Add validation for v4l2 ioctl arguments"

Browse source
This commit is contained in:
Linux Build Service Account 2016-12-30 06:27:32 -08:00 • committed by Gerrit - the friendly Code Review server
commit 3a0a78d5f0
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c
View file

@ -2913,15 +2913,14 @@ static int msm_cpp_validate_input(unsigned int cmd, void *arg,
break; break;
default: { default: {
if (ioctl_ptr == NULL) { if (ioctl_ptr == NULL) {
pr_err("Wrong ioctl_ptr %pK for cmd %u\n", pr_err("Wrong ioctl_ptr for cmd %u\n", cmd);
ioctl_ptr, cmd);
return -EINVAL; return -EINVAL;
} }
*ioctl_ptr = arg; *ioctl_ptr = arg;
if ((*ioctl_ptr == NULL) || if ((*ioctl_ptr == NULL) ||
((*ioctl_ptr)->ioctl_ptr == NULL)) { ((*ioctl_ptr)->ioctl_ptr == NULL)) {
pr_err("Wrong arg %pK for cmd %u\n", arg, cmd); pr_err("Error invalid ioctl argument cmd %u", cmd);
return -EINVAL; return -EINVAL;
} }
break; break;