From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-media@vger.kernel.org
Cc: hverkuil@xs4all.nl, mchehab@kernel.org,
laurent.pinchart@ideasonboard.com
Subject: [PATCH v2 1/3] videobuf2-core: Prevent size alignment wrapping buffer size to 0
Date: Tue, 8 Jan 2019 10:58:34 +0200 [thread overview]
Message-ID: <20190108085836.9376-2-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <20190108085836.9376-1-sakari.ailus@linux.intel.com>
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>
---
drivers/media/common/videobuf2/videobuf2-core.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c
index 0ca81d495bda..0234ddbfa4de 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);
--
2.11.0
next prev parent reply other threads:[~2019-01-08 8:58 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-08 8:58 [PATCH v2 0/3] Videobuf2 corner case fixes Sakari Ailus
2019-01-08 8:58 ` Sakari Ailus [this message]
2019-01-08 12:52 ` [PATCH v2 1/3] videobuf2-core: Prevent size alignment wrapping buffer size to 0 Mauro Carvalho Chehab
2019-01-08 12:59 ` Mauro Carvalho Chehab
2019-01-08 13:01 ` Mauro Carvalho Chehab
2019-01-08 13:38 ` Sakari Ailus
2019-01-08 14:23 ` Mauro Carvalho Chehab
2019-01-09 8:41 ` Sakari Ailus
2019-01-08 13:40 ` Sakari Ailus
2019-01-08 14:30 ` Mauro Carvalho Chehab
2019-01-08 16:05 ` Laurent Pinchart
2019-01-09 12:13 ` Mauro Carvalho Chehab
2019-01-09 13:56 ` Sakari Ailus
2019-01-08 8:58 ` [PATCH v2 2/3] videobuf2-dma-sg: Prevent size from overflowing Sakari Ailus
2019-01-08 13:09 ` Mauro Carvalho Chehab
2019-01-08 13:29 ` Sakari Ailus
2019-01-08 13:44 ` Mauro Carvalho Chehab
2019-01-08 13:57 ` Sakari Ailus
2019-01-08 8:58 ` [PATCH v2 3/3] videobuf2-core.h: Document the alloc memop size argument as page aligned Sakari Ailus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190108085836.9376-2-sakari.ailus@linux.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=hverkuil@xs4all.nl \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.