Commit 06a3c11c authored Oct 08, 2020 by Colin Ian King Committed by Greg Kroah-Hartman Dec 30, 2020

media: tm6000: Fix sizeof() mismatches



[ Upstream commit a08ad6339e0441ca12533969ed94a87e3655426e ]

The are two instances of sizeof() being used incorrectly. The
sizeof(void *) is incorrect because urb_buffer is a char ** pointer,
fix this by using sizeof(*dev->urb_buffer).  The sizeof(dma_addr_t *)
is incorrect, it should be sizeof(*dev->urb_dma), which is a dma_addr_t
and not a dma_addr_t *.  This errors did not cause any issues because
it just so happens the sizes are the same.

Addresses-Coverity: ("Sizeof not portable (SIZEOF_MISMATCH)")

Fixes: 16427faf ("[media] tm6000: Add parameter to keep urb bufs allocated")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 1638c7e3

drivers/media/usb/tm6000/tm6000-video.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -461,11 +461,12 @@ static int tm6000_alloc_urb_buffers(struct tm6000_core *dev)
		if (dev->urb_buffer)
		return 0;

		dev->urb_buffer = kmalloc_array(num_bufs, sizeof(void *), GFP_KERNEL);
		dev->urb_buffer = kmalloc_array(num_bufs, sizeof(*dev->urb_buffer),
		GFP_KERNEL);
		if (!dev->urb_buffer)
		return -ENOMEM;

		dev->urb_dma = kmalloc_array(num_bufs, sizeof(dma_addr_t *),
		dev->urb_dma = kmalloc_array(num_bufs, sizeof(*dev->urb_dma),
		GFP_KERNEL);
		if (!dev->urb_dma)
		return -ENOMEM;