mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Nadav Amit <namit@vmware.com>
To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>,
	"linux-media@vger.kernel.org" <linux-media@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] usb: fix uvc_alloc_entity() allocation alignment
Date: Tue, 7 Aug 2018 00:58:05 +0000	[thread overview]
Message-ID: <0B044CD5-B4F5-4614-B97A-E02E5C1E8A17@vmware.com> (raw)
In-Reply-To: <15813968.YrTFj7ZbY9@avalon>

at 4:58 PM, Laurent Pinchart <laurent.pinchart@ideasonboard.com> wrote:

> Hi Nadav,
> 
> Thank you for the patch.
> 
> On Monday, 4 June 2018 16:47:13 EEST Nadav Amit wrote:
>> 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")
>> 
>> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>> Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
>> Cc: linux-media@vger.kernel.org
>> Cc: linux-kernel@vger.kernel.org
>> 
>> Signed-off-by: Nadav Amit <namit@vmware.com>
>> ---
>> drivers/media/usb/uvc/uvc_driver.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>> diff --git a/drivers/media/usb/uvc/uvc_driver.c
>> b/drivers/media/usb/uvc/uvc_driver.c index 2469b49b2b30..6b989d41c034
>> 100644
>> --- a/drivers/media/usb/uvc/uvc_driver.c
>> +++ b/drivers/media/usb/uvc/uvc_driver.c
>> @@ -909,7 +909,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;
> 
> The purpose of this alignment is to make sure that entity->pads will be 
> properly aligned. In theory the size of uvc_entity should be taken into 
> account too, but the structure contains pointers, so its size should already 
> be properly aligned. This patch thus looks good to me. What made you say it's 
> a stop-gap measure ?

Thanks. It’s been a while. Anyhow, I don’t know how “hot” this code is, but
roundup uses a div operations, so if it is “hot” you may want a different
way to align with lower overhead.

I presume it is not…

Regards,
Nadav

  reply	other threads:[~2018-08-07  0:58 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-04 13:47 Nadav Amit
2018-08-06 23:58 ` Laurent Pinchart
2018-08-07  0:58   ` Nadav Amit [this message]
2018-08-07  8:59     ` Laurent Pinchart

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=0B044CD5-B4F5-4614-B97A-E02E5C1E8A17@vmware.com \
    --to=namit@vmware.com \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®