| Message ID | 20180604134713.101064-1-namit@vmware.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Laurent Pinchart |
| Headers |
Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from <linux-media-owner@vger.kernel.org>) id 1fPwcp-00060w-7s; Mon, 04 Jun 2018 21:02:47 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751445AbeFDVCP (ORCPT <rfc822;mkrufky@linuxtv.org> + 1 other); Mon, 4 Jun 2018 17:02:15 -0400 Received: from ex13-edg-ou-002.vmware.com ([208.91.0.190]:47383 "EHLO EX13-EDG-OU-002.vmware.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751093AbeFDVCN (ORCPT <rfc822;linux-media@vger.kernel.org>); Mon, 4 Jun 2018 17:02:13 -0400 Received: from sc9-mailhost2.vmware.com (10.113.161.72) by EX13-EDG-OU-002.vmware.com (10.113.208.156) with Microsoft SMTP Server id 15.0.1156.6; Mon, 4 Jun 2018 14:02:00 -0700 Received: from sc2-haas01-esx0118.eng.vmware.com (sc2-haas01-esx0118.eng.vmware.com [10.172.44.118]) by sc9-mailhost2.vmware.com (Postfix) with ESMTP id 4E012B0B78; Mon, 4 Jun 2018 14:02:13 -0700 (PDT) From: Nadav Amit <namit@vmware.com> To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Mauro Carvalho Chehab <mchehab@kernel.org> CC: Nadav Amit <namit@vmware.com>, <linux-media@vger.kernel.org>, <linux-kernel@vger.kernel.org> Subject: [PATCH] usb: fix uvc_alloc_entity() allocation alignment Date: Mon, 4 Jun 2018 06:47:13 -0700 Message-ID: <20180604134713.101064-1-namit@vmware.com> X-Mailer: git-send-email 2.17.0 MIME-Version: 1.0 Content-Type: text/plain Received-SPF: None (EX13-EDG-OU-002.vmware.com: namit@vmware.com does not designate permitted sender hosts) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org |
Commit Message
Nadav Amit
June 4, 2018, 1:47 p.m. UTC
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(-)
Comments
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 ? Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> and applied to my tree.
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
Hi Nadav, On Tuesday, 7 August 2018 03:58:05 EEST Nadav Amit wrote: > at 4:58 PM, Laurent Pinchart <laurent.pinchart@ideasonboard.com> wrote: > > 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… You're right, it isn't. I'll include this patch in my next pull request for v4.20.
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;