mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-21 16:29:59 +00:00
Code Issues Releases Wiki Activity

media: imx-media-utils: fix a warning

Browse source 
The logic at find_format() is a little bit confusing even for
humans, and it tricks static code analyzers:

	drivers/staging/media/imx/imx-media-utils.c:259 find_format() error: buffer overflow 'array' 14 <= 20

Rewrite the logic in a way that it makes it clearer to understand,
while prevent static analyzers to produce false positives.

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Mauro Carvalho Chehab 2018-03-22 09:11:20 -04:00
parent 39adb4e739
commit a23deac60a
1 changed files with 43 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
drivers/staging/media/imx/imx-media-utils.c
View file

@ -225,58 +225,63 @@ static void init_mbus_colorimetry(struct v4l2_mbus_framefmt *mbus,
mbus->ycbcr_enc);
}
static const
struct imx_media_pixfmt *__find_format(u32 fourcc,
u32 code,
bool allow_non_mbus,
bool allow_bayer,
const struct imx_media_pixfmt *array,
u32 array_size)
{
const struct imx_media_pixfmt *fmt;
int i, j;
for (i = 0; i < array_size; i++) {
fmt = &array[i];
if ((!allow_non_mbus && !fmt->codes[0]) ||
(!allow_bayer && fmt->bayer))
continue;
if (fourcc && fmt->fourcc == fourcc)
return fmt;
if (!code)
continue;
for (j = 0; fmt->codes[j]; j++) {
if (code == fmt->codes[j])
return fmt;
}
}
return NULL;
}
static const struct imx_media_pixfmt *find_format(u32 fourcc,
u32 code,
enum codespace_sel cs_sel,
bool allow_non_mbus,
bool allow_bayer)
{
const struct imx_media_pixfmt *array, *fmt, *ret = NULL;
u32 array_size;
int i, j;
const struct imx_media_pixfmt *ret;
switch (cs_sel) {
case CS_SEL_YUV:
array_size = NUM_YUV_FORMATS;
array = yuv_formats;
break;
return __find_format(fourcc, code, allow_non_mbus, allow_bayer,
yuv_formats, NUM_YUV_FORMATS);
case CS_SEL_RGB:
array_size = NUM_RGB_FORMATS;
array = rgb_formats;
break;
return __find_format(fourcc, code, allow_non_mbus, allow_bayer,
rgb_formats, NUM_RGB_FORMATS);
case CS_SEL_ANY:
array_size = NUM_YUV_FORMATS + NUM_RGB_FORMATS;
array = yuv_formats;
break;
ret = __find_format(fourcc, code, allow_non_mbus, allow_bayer,
yuv_formats, NUM_YUV_FORMATS);
if (ret)
return ret;
return __find_format(fourcc, code, allow_non_mbus, allow_bayer,
rgb_formats, NUM_RGB_FORMATS);
default:
return NULL;
}
for (i = 0; i < array_size; i++) {
if (cs_sel == CS_SEL_ANY && i >= NUM_YUV_FORMATS)
fmt = &rgb_formats[i - NUM_YUV_FORMATS];
else
fmt = &array[i];
if ((!allow_non_mbus && fmt->codes[0] == 0) ||
(!allow_bayer && fmt->bayer))
continue;
if (fourcc && fmt->fourcc == fourcc) {
ret = fmt;
goto out;
}
for (j = 0; code && fmt->codes[j]; j++) {
if (code == fmt->codes[j]) {
ret = fmt;
goto out;
}
}
}
out:
return ret;
}
static int enum_format(u32 *fourcc, u32 *code, u32 index,