github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 14:42:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

media: staging/intel-ipu3: Fix race condition during set_fmt

Browse Source 
commit dccfe25487 upstream.

Do not modify imgu_pipe->nodes[inode].vdev_fmt.fmt.pix_mp, until the
format has been correctly validated.

Otherwise, even if we use a backup variable, there is a period of time
where imgu_pipe->nodes[inode].vdev_fmt.fmt.pix_mp might have an invalid
value that can be used by other functions.

Cc: stable@vger.kernel.org
Fixes: ad91849996 ("media: staging/intel-ipu3: Fix set_fmt error handling")
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ricardo Ribalda 2021-04-09 10:41:35 +02:00 committed by Greg Kroah-Hartman
parent c6b81b897f
commit 4121def7df
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/staging/media/ipu3/ipu3-v4l2.c
View File

@ -669,7 +669,6 @@ static int imgu_fmt(struct imgu_device *imgu, unsigned int pipe, int node,
struct imgu_css_pipe *css_pipe = &imgu->css.pipes[pipe]; struct imgu_css_pipe *css_pipe = &imgu->css.pipes[pipe];
struct imgu_media_pipe *imgu_pipe = &imgu->imgu_pipe[pipe]; struct imgu_media_pipe *imgu_pipe = &imgu->imgu_pipe[pipe];
struct imgu_v4l2_subdev *imgu_sd = &imgu_pipe->imgu_sd; struct imgu_v4l2_subdev *imgu_sd = &imgu_pipe->imgu_sd;
struct v4l2_pix_format_mplane fmt_backup;
dev_dbg(dev, "set fmt node [%u][%u](try = %u)", pipe, node, try); dev_dbg(dev, "set fmt node [%u][%u](try = %u)", pipe, node, try);
@ -687,6 +686,7 @@ static int imgu_fmt(struct imgu_device *imgu, unsigned int pipe, int node,
dev_dbg(dev, "IPU3 pipe %u pipe_id = %u", pipe, css_pipe->pipe_id); dev_dbg(dev, "IPU3 pipe %u pipe_id = %u", pipe, css_pipe->pipe_id);
css_q = imgu_node_to_queue(node);
for (i = 0; i < IPU3_CSS_QUEUES; i++) { for (i = 0; i < IPU3_CSS_QUEUES; i++) {
unsigned int inode = imgu_map_node(imgu, i); unsigned int inode = imgu_map_node(imgu, i);
@ -701,6 +701,11 @@ static int imgu_fmt(struct imgu_device *imgu, unsigned int pipe, int node,
continue; continue;
} }
if (i == css_q) {
fmts[i] = &f->fmt.pix_mp;
continue;
}
if (try) { if (try) {
fmts[i] = kmemdup(&imgu_pipe->nodes[inode].vdev_fmt.fmt.pix_mp, fmts[i] = kmemdup(&imgu_pipe->nodes[inode].vdev_fmt.fmt.pix_mp,
sizeof(struct v4l2_pix_format_mplane), sizeof(struct v4l2_pix_format_mplane),
@ -729,39 +734,32 @@ static int imgu_fmt(struct imgu_device *imgu, unsigned int pipe, int node,
rects[IPU3_CSS_RECT_GDC]->height = pad_fmt.height; rects[IPU3_CSS_RECT_GDC]->height = pad_fmt.height;
} }
/*
* imgu doesn't set the node to the value given by user
* before we return success from this function, so set it here.
*/
css_q = imgu_node_to_queue(node);
if (!fmts[css_q]) { if (!fmts[css_q]) {
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} }
fmt_backup = *fmts[css_q];
*fmts[css_q] = f->fmt.pix_mp;
if (try) if (try)
ret = imgu_css_fmt_try(&imgu->css, fmts, rects, pipe); ret = imgu_css_fmt_try(&imgu->css, fmts, rects, pipe);
else else
ret = imgu_css_fmt_set(&imgu->css, fmts, rects, pipe); ret = imgu_css_fmt_set(&imgu->css, fmts, rects, pipe);
if (try || ret < 0)
*fmts[css_q] = fmt_backup;
/* ret is the binary number in the firmware blob */ /* ret is the binary number in the firmware blob */
if (ret < 0) if (ret < 0)
goto out; goto out;
if (try) /*
f->fmt.pix_mp = *fmts[css_q]; * imgu doesn't set the node to the value given by user
else * before we return success from this function, so set it here.
f->fmt = imgu_pipe->nodes[node].vdev_fmt.fmt; */
if (!try)
imgu_pipe->nodes[node].vdev_fmt.fmt.pix_mp = f->fmt.pix_mp;
out: out:
if (try) { if (try) {
for (i = 0; i < IPU3_CSS_QUEUES; i++) for (i = 0; i < IPU3_CSS_QUEUES; i++)
kfree(fmts[i]); if (i != css_q)
kfree(fmts[i]);
} }
return ret; return ret;