diff options
| author | Sakari Ailus <sakari.ailus@linux.intel.com> | 2018-12-12 07:27:10 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-26 09:14:24 +0200 |
| commit | cb2e2b0ae55421b320830dbd5d860aadce86bf3e (patch) | |
| tree | 37aedda56727040529bd1f74527adb2623b22ec0 | |
| parent | deb78bd24e0cd196acffbedffb9bed7a8839b227 (diff) | |
| download | linux-stable-cb2e2b0ae55421b320830dbd5d860aadce86bf3e.tar.gz linux-stable-cb2e2b0ae55421b320830dbd5d860aadce86bf3e.tar.bz2 linux-stable-cb2e2b0ae55421b320830dbd5d860aadce86bf3e.zip | |
media: videobuf2-core: Prevent size alignment wrapping buffer size to 0
commit defcdc5d89ced780fb45196d539d6570ec5b1ba5 upstream.
PAGE_ALIGN() may wrap the buffer size around to 0. Prevent this by
checking that the aligned value is not smaller than the unaligned one.
Note on backporting to stable: the file used to be under
drivers/media/v4l2-core, it was moved to the current location after 4.14.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Cc: stable@vger.kernel.org
Reviewed-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/media/common/videobuf2/videobuf2-core.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c index 9226dca44e90..93d250db0b6f 100644 --- a/drivers/media/common/videobuf2/videobuf2-core.c +++ b/drivers/media/common/videobuf2/videobuf2-core.c @@ -207,6 +207,10 @@ static int __vb2_buf_mem_alloc(struct vb2_buffer *vb) for (plane = 0; plane < vb->num_planes; ++plane) { unsigned long size = PAGE_ALIGN(vb->planes[plane].length); + /* Did it wrap around? */ + if (size < vb->planes[plane].length) + goto free; + mem_priv = call_ptr_memop(vb, alloc, q->alloc_devs[plane] ? : q->dev, q->dma_attrs, size, q->dma_dir, q->gfp_flags); |