]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
[media] v4l: xilinx: harmless buffer overflow
authorDan Carpenter <dan.carpenter@oracle.com>
Tue, 21 Apr 2015 09:31:10 +0000 (06:31 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Wed, 13 May 2015 19:26:48 +0000 (16:26 -0300)
My static checker warns that the name of the port can be 15 characters
when you consider the NUL terminator and that's one more than the 14
characters in name[].  Maybe it's an off-by-one?

It's unlikely that we hit the limit and even if we do the overflow will
only affect one of the two bytes of padding so it's harmless.  Still
let's fix it and also change the sprintf() to snprintf().

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/platform/xilinx/xilinx-dma.c

index efde88adf624d62e268d927f1e52d8f4aeb1ee60..98e50e446d57a2b835d93e65992a55ebc1918713 100644 (file)
@@ -653,7 +653,7 @@ static const struct v4l2_file_operations xvip_dma_fops = {
 int xvip_dma_init(struct xvip_composite_device *xdev, struct xvip_dma *dma,
                  enum v4l2_buf_type type, unsigned int port)
 {
-       char name[14];
+       char name[16];
        int ret;
 
        dma->xdev = xdev;
@@ -725,7 +725,7 @@ int xvip_dma_init(struct xvip_composite_device *xdev, struct xvip_dma *dma,
        }
 
        /* ... and the DMA channel. */
-       sprintf(name, "port%u", port);
+       snprintf(name, sizeof(name), "port%u", port);
        dma->dma = dma_request_slave_channel(dma->xdev->dev, name);
        if (dma->dma == NULL) {
                dev_err(dma->xdev->dev, "no VDMA channel found\n");