mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-11-01 17:08:10 +00:00
Code Issues Releases Wiki Activity

media: vivid: shut up warnings due to a non-trivial logic

Browse source 
The vivid driver uses a complex logic to save one kalloc/kfree
allocation. That non-trivial way of allocating data causes
smatch to warn:
	drivers/media/platform/vivid/vivid-core.c:869 vivid_create_instance() warn: potentially one past the end of array 'dev->query_dv_timings_qmenu[dev->query_dv_timings_size]'
	drivers/media/platform/vivid/vivid-core.c:869 vivid_create_instance() warn: potentially one past the end of array 'dev->query_dv_timings_qmenu[dev->query_dv_timings_size]'

I also needed to read the code several times in order to understand
what it was desired there. It turns that the logic was right,
although confusing to read.

As it is doing allocations on a non-standard way, let's add some
documentation while shutting up the false positive.

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Mauro Carvalho Chehab 2018-08-07 07:29:12 -04:00
parent 845b978a87
commit 3354b54f9f
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/media/platform/vivid/vivid-core.c
View file

@ -647,6 +647,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)
unsigned node_type = node_types[inst];
unsigned int allocator = allocators[inst];
v4l2_std_id tvnorms_cap = 0, tvnorms_out = 0;
char *strings_base;
int ret;
int i;
@ -859,17 +860,33 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)
/* create a string array containing the names of all the preset timings */
while (v4l2_dv_timings_presets[dev->query_dv_timings_size].bt.width)
dev->query_dv_timings_size++;
/*
* In order to save one allocation and an extra free, let's optimize
* the allocation here: we'll use the first elements of the
* dev->query_dv_timings_qmenu to store the timing strings pointer,
* adding an extra space there to a store a string up to 32 bytes.
* So, instead of allocating an array with size of:
* dev->query_dv_timings_size * (sizeof(void *)
* it will allocate:
* dev->query_dv_timings_size * (sizeof(void *) +
* dev->query_dv_timings_size * 32
*/
dev->query_dv_timings_qmenu = kmalloc_array(dev->query_dv_timings_size,
(sizeof(void *) + 32),
GFP_KERNEL);
if (dev->query_dv_timings_qmenu == NULL)
goto free_dev;
/* Sets strings_base to be after the space to store the pointers */
strings_base = ((char *)&dev->query_dv_timings_qmenu)
+ dev->query_dv_timings_size * sizeof(void *);
for (i = 0; i < dev->query_dv_timings_size; i++) {
const struct v4l2_bt_timings *bt = &v4l2_dv_timings_presets[i].bt;
char *p = (char *)&dev->query_dv_timings_qmenu[dev->query_dv_timings_size];
char *p = strings_base + i * 32;
u32 htot, vtot;
p += i * 32;
dev->query_dv_timings_qmenu[i] = p;
htot = V4L2_DV_BT_FRAME_WIDTH(bt);