From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 7 Jun 2019 15:37:36 +0000 (+0200)
Subject: 4.14-stable patches
X-Git-Tag: v5.1.8~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=04db969ee154505333e7260523e1a267f941357c;p=thirdparty%2Fkernel%2Fstable-queue.git

4.14-stable patches

added patches:
	media-uvcvideo-fix-uvc_alloc_entity-allocation-alignment.patch
---

diff --git a/queue-4.14/media-uvcvideo-fix-uvc_alloc_entity-allocation-alignment.patch b/queue-4.14/media-uvcvideo-fix-uvc_alloc_entity-allocation-alignment.patch
new file mode 100644
index 00000000000..ecac4cca223
--- /dev/null
+++ b/queue-4.14/media-uvcvideo-fix-uvc_alloc_entity-allocation-alignment.patch
@@ -0,0 +1,39 @@
+From 89dd34caf73e28018c58cd193751e41b1f8bdc56 Mon Sep 17 00:00:00 2001
+From: Nadav Amit <namit@vmware.com>
+Date: Mon, 4 Jun 2018 09:47:13 -0400
+Subject: media: uvcvideo: Fix uvc_alloc_entity() allocation alignment
+
+From: Nadav Amit <namit@vmware.com>
+
+commit 89dd34caf73e28018c58cd193751e41b1f8bdc56 upstream.
+
+The use of ALIGN() in uvc_alloc_entity() is incorrect, since the size of
+(entity->pads) is not a power of two. As a stop-gap, until a better
+solution is adapted, use roundup() instead.
+
+Found by a static assertion. Compile-tested only.
+
+Fixes: 4ffc2d89f38a ("uvcvideo: Register subdevices for each entity")
+
+Signed-off-by: Nadav Amit <namit@vmware.com>
+Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+Cc: Doug Anderson <dianders@chromium.org>
+Cc: Ben Hutchings <ben@decadent.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/media/usb/uvc/uvc_driver.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/media/usb/uvc/uvc_driver.c
++++ b/drivers/media/usb/uvc/uvc_driver.c
+@@ -903,7 +903,7 @@ static struct uvc_entity *uvc_alloc_enti
+ 	unsigned int size;
+ 	unsigned int i;
+ 
+-	extra_size = ALIGN(extra_size, sizeof(*entity->pads));
++	extra_size = roundup(extra_size, sizeof(*entity->pads));
+ 	num_inputs = (type & UVC_TERM_OUTPUT) ? num_pads : num_pads - 1;
+ 	size = sizeof(*entity) + extra_size + sizeof(*entity->pads) * num_pads
+ 	     + num_inputs;
diff --git a/queue-4.14/series b/queue-4.14/series
index dd5f0c13879..009a7f9f942 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -66,3 +66,4 @@ include-linux-module.h-copy-__init-__exit-attrs-to-init-cleanup_module.patch
 revert-x86-build-move-_etext-to-actual-end-of-.text.patch
 revert-binder-fix-handling-of-misaligned-binder-object.patch
 binder-fix-race-between-munmap-and-direct-reclaim.patch
+media-uvcvideo-fix-uvc_alloc_entity-allocation-alignment.patch