]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
media: videobuf2-dma-sg: Prevent size from overflowing
authorSakari Ailus <sakari.ailus@linux.intel.com>
Wed, 12 Dec 2018 12:44:14 +0000 (07:44 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 26 Jul 2019 07:10:58 +0000 (09:10 +0200)
commit 14f28f5cea9e3998442de87846d1907a531b6748 upstream.

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
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>
drivers/media/common/videobuf2/videobuf2-dma-sg.c

index 4a4c49d6085ce99c08623a63a5d33c8c36022fca..0f06f08346ba5d7ac8bf36a1e47d83c9b8a05772 100644 (file)
@@ -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;