| 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 |
| @@ -914,7 +914,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; |
