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 1/3] videobuf2-core: Prevent size alignment wrapping buffer size to 0
Date: Thu, 13 Dec 2018 12:40:04 +0200 [thread overview]
Message-ID: <20181213104006.401-2-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <20181213104006.401-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
---
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 0ca81d495bdaf..0234ddbfa4de2 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:[~2018-12-13 10:40 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-13 10:40 [PATCH 0/3] Videobuf2 corner case fixes Sakari Ailus
2018-12-13 10:40 ` Sakari Ailus [this message]
2018-12-13 11:22 ` [PATCH 1/3] videobuf2-core: Prevent size alignment wrapping buffer size to 0 Hans Verkuil
2018-12-13 12:49 ` Laurent Pinchart
2018-12-13 13:06 ` Sakari Ailus
2018-12-13 10:40 ` [PATCH 2/3] videobuf2-dma-sg: Prevent size from overflowing Sakari Ailus
2018-12-13 11:24 ` Hans Verkuil
2018-12-13 12:57 ` Laurent Pinchart
2018-12-13 13:00 ` Sakari Ailus
2018-12-13 13:03 ` Laurent Pinchart
2018-12-13 13:07 ` Sakari Ailus
2018-12-13 10:40 ` [PATCH 3/3] videobuf2-core.h: Document the alloc memop size argument as page aligned Sakari Ailus
2018-12-13 11:25 ` Hans Verkuil
2018-12-13 12:59 ` Laurent Pinchart
2018-12-13 13:02 ` Sakari Ailus
2018-12-13 13:08 ` Laurent Pinchart
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=20181213104006.401-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox