public inbox for linux-media@vger.kernel.org
 help / color / mirror / Atom feed
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 2/3] videobuf2-dma-sg: Prevent size from overflowing
Date: Thu, 13 Dec 2018 12:40:05 +0200	[thread overview]
Message-ID: <20181213104006.401-3-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <20181213104006.401-1-sakari.ailus@linux.intel.com>

buf->size is an unsigned long; casting that to int will lead to an
overflow if buf->size exceeds INT_MAX.

Fix this by changing the type to unsigned long instead. This is possible
as the buf->size is always aligned to PAGE_SIZE, and therefore the size
will never have values lesser than 0.

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-dma-sg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/common/videobuf2/videobuf2-dma-sg.c b/drivers/media/common/videobuf2/videobuf2-dma-sg.c
index 015e737095cdd..e9bfea986cc47 100644
--- a/drivers/media/common/videobuf2/videobuf2-dma-sg.c
+++ b/drivers/media/common/videobuf2/videobuf2-dma-sg.c
@@ -59,7 +59,7 @@ static int vb2_dma_sg_alloc_compacted(struct vb2_dma_sg_buf *buf,
 		gfp_t gfp_flags)
 {
 	unsigned int last_page = 0;
-	int size = buf->size;
+	unsigned long size = buf->size;
 
 	while (size > 0) {
 		struct page *pages;
-- 
2.11.0


  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 ` [PATCH 1/3] videobuf2-core: Prevent size alignment wrapping buffer size to 0 Sakari Ailus
2018-12-13 11:22   ` Hans Verkuil
2018-12-13 12:49   ` Laurent Pinchart
2018-12-13 13:06     ` Sakari Ailus
2018-12-13 10:40 ` Sakari Ailus [this message]
2018-12-13 11:24   ` [PATCH 2/3] videobuf2-dma-sg: Prevent size from overflowing 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-3-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