Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9861e2cd authored by Nadav Amit's avatar Nadav Amit Committed by Greg Kroah-Hartman
Browse files

media: uvcvideo: Fix uvc_alloc_entity() allocation alignment 



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: 4ffc2d89 ("uvcvideo: Register subdevices for each entity")

Signed-off-by: default avatarNadav Amit <namit@vmware.com>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Cc: Doug Anderson <dianders@chromium.org>
Cc: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b52ca352

drivers/media/usb/uvc/uvc_driver.c

+1 −1
Original line number Diff line number Diff line
@@ -914,7 +914,7 @@ static struct uvc_entity *uvc_alloc_entity(u16 type, u8 id, 
	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;