From: Greg Kroah-Hartman Date: Fri, 7 Jun 2019 15:36:44 +0000 (+0200) Subject: 4.4-stable patches X-Git-Tag: v5.1.8~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a0e0937118c36efcb869231c04f94a23d6978c45;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: media-uvcvideo-fix-uvc_alloc_entity-allocation-alignment.patch --- diff --git a/queue-4.4/media-uvcvideo-fix-uvc_alloc_entity-allocation-alignment.patch b/queue-4.4/media-uvcvideo-fix-uvc_alloc_entity-allocation-alignment.patch new file mode 100644 index 00000000000..58f656fc08c --- /dev/null +++ b/queue-4.4/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 +Date: Mon, 4 Jun 2018 09:47:13 -0400 +Subject: media: uvcvideo: Fix uvc_alloc_entity() allocation alignment + +From: Nadav Amit + +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 +Signed-off-by: Laurent Pinchart +Signed-off-by: Mauro Carvalho Chehab +Cc: Doug Anderson +Cc: Ben Hutchings +Signed-off-by: Greg Kroah-Hartman + +--- + 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 +@@ -868,7 +868,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.4/series b/queue-4.4/series index df2d06a5a72..2cc86afa24c 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -226,3 +226,4 @@ userfaultfd-don-t-pin-the-user-memory-in-userfaultfd_file_create.patch revert-x86-build-move-_etext-to-actual-end-of-.text.patch net-cdc_ncm-getntbformat-endian-fix.patch usb-gadget-fix-request-length-error-for-isoc-transfer.patch +media-uvcvideo-fix-uvc_alloc_entity-allocation-alignment.patch diff --git a/queue-4.4/tipc-fix-modprobe-tipc-failed-after-switch-order-of-device-registration-v2.patch b/queue-4.4/tipc-fix-modprobe-tipc-failed-after-switch-order-of-device-registration-v2.patch index 06d9ade1686..a7cee543f31 100644 --- a/queue-4.4/tipc-fix-modprobe-tipc-failed-after-switch-order-of-device-registration-v2.patch +++ b/queue-4.4/tipc-fix-modprobe-tipc-failed-after-switch-order-of-device-registration-v2.patch @@ -1,7 +1,7 @@ From 526f5b851a96566803ee4bee60d0a34df56c77f8 Mon Sep 17 00:00:00 2001 From: Junwei Hu Date: Mon, 20 May 2019 14:43:59 +0800 -Subject: tipc: fix modprobe tipc failed after switch order of device registration +Subject: tipc: fix modprobe tipc failed after switch order of device registration -v2 From: Junwei Hu