From 65c1167373449c60708109b89e3117edf0074c62 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 6 Apr 2018 14:45:59 -0400 Subject: [PATCH] media: staging: atomisp: fix string comparation logic it makes no sense to use strncmp() with a size with is bigger than the string we're comparing with. Fix those warnings: drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c:776 atomisp_open() error: strncmp() '"ATOMISP ISP ACC"' too small (16 vs 32) drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c:913 atomisp_release() error: strncmp() '"ATOMISP ISP ACC"' too small (16 vs 32) drivers/staging/media/atomisp/pci/atomisp2/atomisp_ioctl.c:2751 atomisp_vidioc_default() error: strncmp() '"ATOMISP ISP ACC"' too small (16 vs 32) Signed-off-by: Mauro Carvalho Chehab --- drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c | 6 ++---- drivers/staging/media/atomisp/pci/atomisp2/atomisp_ioctl.c | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c index 709137f25700..693b905547e4 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c @@ -773,8 +773,7 @@ static int atomisp_open(struct file *file) rt_mutex_lock(&isp->mutex); - acc_node = !strncmp(vdev->name, "ATOMISP ISP ACC", - sizeof(vdev->name)); + acc_node = !strcmp(vdev->name, "ATOMISP ISP ACC"); if (acc_node) { acc_pipe = atomisp_to_acc_pipe(vdev); asd = acc_pipe->asd; @@ -910,8 +909,7 @@ static int atomisp_release(struct file *file) rt_mutex_lock(&isp->mutex); dev_dbg(isp->dev, "release device %s\n", vdev->name); - acc_node = !strncmp(vdev->name, "ATOMISP ISP ACC", - sizeof(vdev->name)); + acc_node = !strcmp(vdev->name, "ATOMISP ISP ACC"); if (acc_node) { acc_pipe = atomisp_to_acc_pipe(vdev); asd = acc_pipe->asd; diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_ioctl.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_ioctl.c index 6e7231243891..8c67aea67b6b 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_ioctl.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_ioctl.c @@ -2748,8 +2748,7 @@ static long atomisp_vidioc_default(struct file *file, void *fh, bool acc_node; int err; - acc_node = !strncmp(vdev->name, "ATOMISP ISP ACC", - sizeof(vdev->name)); + acc_node = !strcmp(vdev->name, "ATOMISP ISP ACC"); if (acc_node) asd = atomisp_to_acc_pipe(vdev)->asd; else -- 2.11.0