kevin/linux
1
Fork 0
Code

media: videobuf2-core: copy vb planes unconditionally

Browse Source 
Copy the relevant data from userspace to the vb->planes unconditionally
as it's possible some of the fields may have changed after the buffer
has been validated.

Keep the dma_buf_put(planes[plane].dbuf) calls in the first
`if (!reacquired)` case, in order to be close to the plane validation code
where the buffers were got in the first place.

Cc: stable@vger.kernel.org
Fixes: 95af7c00f3 ("media: videobuf2-core: release all planes first in __prepare_dmabuf()")
Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org>
Tested-by: Will McVicker <willmcvicker@google.com>
Acked-by: Tomasz Figa <tfiga@chromium.org>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
This commit is contained in:
Tudor Ambarus 2024-11-06 12:18:02 +00:00 committed by Hans Verkuil
parent a4aebaf6e6
commit 702a47ce6d
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/media/common/videobuf2/videobuf2-core.c
View File

@ -1482,18 +1482,23 @@ static int __prepare_dmabuf(struct vb2_buffer *vb)
} }
vb->planes[plane].dbuf_mapped = 1; vb->planes[plane].dbuf_mapped = 1;
} }
} else {
for (plane = 0; plane < vb->num_planes; ++plane)
dma_buf_put(planes[plane].dbuf);
}
/* /*
* Now that everything is in order, copy relevant information * Now that everything is in order, copy relevant information
* provided by userspace. * provided by userspace.
*/ */
for (plane = 0; plane < vb->num_planes; ++plane) { for (plane = 0; plane < vb->num_planes; ++plane) {
vb->planes[plane].bytesused = planes[plane].bytesused; vb->planes[plane].bytesused = planes[plane].bytesused;
vb->planes[plane].length = planes[plane].length; vb->planes[plane].length = planes[plane].length;
vb->planes[plane].m.fd = planes[plane].m.fd; vb->planes[plane].m.fd = planes[plane].m.fd;
vb->planes[plane].data_offset = planes[plane].data_offset; vb->planes[plane].data_offset = planes[plane].data_offset;
} }
if (reacquired) {
/* /*
* Call driver-specific initialization on the newly acquired buffer, * Call driver-specific initialization on the newly acquired buffer,
* if provided. * if provided.
@ -1503,9 +1508,6 @@ static int __prepare_dmabuf(struct vb2_buffer *vb)
dprintk(q, 1, "buffer initialization failed\n"); dprintk(q, 1, "buffer initialization failed\n");
goto err_put_vb2_buf; goto err_put_vb2_buf;
} }
} else {
for (plane = 0; plane < vb->num_planes; ++plane)
dma_buf_put(planes[plane].dbuf);
} }
ret = call_vb_qop(vb, buf_prepare, vb); ret = call_vb_qop(vb, buf_prepare, vb);