From c706a2812f57b5732be34df296e74bacb9b72276 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lassi=20V=C3=A4=C3=A4t=C3=A4m=C3=B6inen?= Date: Tue, 13 Mar 2012 14:47:40 +0200 Subject: [PATCH] atomisp: fixes Klocwork issues MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit BZ: 24562 Fixes Klockwork issue #114398, which are under atomisp driver. The case #114393 is a false positive, and is omitted. The case #114433 is under V4L2 subsystem, and should not be addressed by us. Change-Id: I20a1370c600ce63e25a5ba9e9fc2958c6adbf9ec Signed-off-by: Lassi Väätämöinen Reviewed-on: http://android.intel.com:8080/36576 Reviewed-by: Cohen, David A Reviewed-by: Sutic, Aleksandar Reviewed-by: Mandy, Arnaud Reviewed-by: Koski, Anttu Tested-by: Koski, Anttu Reviewed-by: Koskinen, Ilkka Reviewed-by: buildbot Tested-by: buildbot --- drivers/media/video/atomisp/atomisp_ioctl.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/media/video/atomisp/atomisp_ioctl.c b/drivers/media/video/atomisp/atomisp_ioctl.c index 3e59b11..cc68697 100644 --- a/drivers/media/video/atomisp/atomisp_ioctl.c +++ b/drivers/media/video/atomisp/atomisp_ioctl.c @@ -202,19 +202,24 @@ static const u32 ctrls_num = ARRAY_SIZE(ci_v4l2_controls); * FIXME: capabilities should be different for video0/video2/video3 */ static int atomisp_querycap(struct file *file, void *fh, - struct v4l2_capability *cap) + struct v4l2_capability *cap) { int ret = 0; memset(cap, 0, sizeof(struct v4l2_capability)); - strncpy(cap->driver, DRIVER, strlen(DRIVER)); - strncpy(cap->card, CARD, strlen(CARD)); - strncpy(cap->bus_info, BUS_INFO, strlen(BUS_INFO)); + + WARN_ON(sizeof(DRIVER) > sizeof(cap->driver) || + sizeof(CARD) > sizeof(cap->card) || + sizeof(BUS_INFO) > sizeof(cap->bus_info)); + + strncpy(cap->driver, DRIVER, sizeof(cap->driver) - 1); + strncpy(cap->card, CARD, sizeof(cap->card) - 1); + strncpy(cap->bus_info, BUS_INFO, sizeof(cap->card) - 1); + cap->version = VERSION; cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | - V4L2_CAP_STREAMING | - V4L2_CAP_VIDEO_OUTPUT; + V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_OUTPUT; return ret; } -- 2.7.4