Commit 89dd34ca authored by Nadav Amit's avatar Nadav Amit Committed by Mauro Carvalho Chehab

media: uvcvideo: Fix uvc_alloc_entity() allocation alignment

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>
parent 6689df06
...@@ -914,7 +914,7 @@ static struct uvc_entity *uvc_alloc_entity(u16 type, u8 id, ...@@ -914,7 +914,7 @@ static struct uvc_entity *uvc_alloc_entity(u16 type, u8 id,
unsigned int size; unsigned int size;
unsigned int i; 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; num_inputs = (type & UVC_TERM_OUTPUT) ? num_pads : num_pads - 1;
size = sizeof(*entity) + extra_size + sizeof(*entity->pads) * num_pads size = sizeof(*entity) + extra_size + sizeof(*entity->pads) * num_pads
+ num_inputs; + num_inputs;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment