From 3bfff20e7f6fd45b37456a079513ce2559356504 Mon Sep 17 00:00:00 2001 From: Krishnankutty Kolathappilly Date: Tue, 27 Dec 2016 11:45:54 -0800 Subject: [PATCH] msm: camera: cpp: Add validation for v4l2 ioctl arguments Print the command instead of the printing ioctl ptr to avoid information disclosure CRs-Fixed: 1105663 Change-Id: I862a0a502c60519a864cfe12aacf7840ae094c1c Signed-off-by: Krishnankutty Kolathappilly --- drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c b/drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c index b7724b4bf936..4527d6699b88 100644 --- a/drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c +++ b/drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c @@ -2913,15 +2913,14 @@ static int msm_cpp_validate_input(unsigned int cmd, void *arg, break; default: { if (ioctl_ptr == NULL) { - pr_err("Wrong ioctl_ptr %pK for cmd %u\n", - ioctl_ptr, cmd); + pr_err("Wrong ioctl_ptr for cmd %u\n", cmd); return -EINVAL; } *ioctl_ptr = arg; if ((*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; } break;