Commit 27c03975 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

[media] sr030pc30: don't read a new pointer

sr030pc30_get_fmt() can only succeed if both info->curr_win and
info->curr_fmt are not NULL.

If one of those vars are null, the curent code would call:
	ret = sr030pc30_set_params(sd);

If the curr_win is null, it will return -EINVAL, as it would be
expected. However, if curr_fmt is NULL, the function won't
set it.

The code will then try to read from it:

        mf->code        = info->curr_fmt->code;
        mf->colorspace  = info->curr_fmt->colorspace;

with obviouly won't work.

This got reported by smatch:
	drivers/media/i2c/sr030pc30.c:505 sr030pc30_get_fmt() error: we previously assumed 'info->curr_win' could be null (see line 499)
	drivers/media/i2c/sr030pc30.c:507 sr030pc30_get_fmt() error: we previously assumed 'info->curr_fmt' could be null (see line 499)
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent ab9a953b
...@@ -489,18 +489,14 @@ static int sr030pc30_get_fmt(struct v4l2_subdev *sd, ...@@ -489,18 +489,14 @@ static int sr030pc30_get_fmt(struct v4l2_subdev *sd,
{ {
struct v4l2_mbus_framefmt *mf; struct v4l2_mbus_framefmt *mf;
struct sr030pc30_info *info = to_sr030pc30(sd); struct sr030pc30_info *info = to_sr030pc30(sd);
int ret;
if (!format || format->pad) if (!format || format->pad)
return -EINVAL; return -EINVAL;
mf = &format->format; mf = &format->format;
if (!info->curr_win || !info->curr_fmt) { if (!info->curr_win || !info->curr_fmt)
ret = sr030pc30_set_params(sd); return -EINVAL;
if (ret)
return ret;
}
mf->width = info->curr_win->width; mf->width = info->curr_win->width;
mf->height = info->curr_win->height; mf->height = info->curr_win->height;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment