Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp4482963imm; Tue, 7 Aug 2018 02:11:18 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeKfaornLXo5n6jo6iAR5pUnzSFTdPH6gY8wEW/aq6kE+9zhKEBhDz24YA5LJedYU9iQCuQ X-Received: by 2002:a62:8a4f:: with SMTP id y76-v6mr21073027pfd.233.1533633078565; Tue, 07 Aug 2018 02:11:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533633078; cv=none; d=google.com; s=arc-20160816; b=VSycTJOmWiEUjJtGCZ1jk/SaYwwY0G4bRndniQFVn6deCHCp9gJSrJjQNTCcX/0NSH yW/u0caMT22hEpKFX7SjswiobTTphq0onH+CJOPCODMgkFYJuahf4w7WwcgP6MrqqlCr BCbXLyykpni6JU/cCC0ZIGSSF8+FMaSXDQVOIyd9xzgTOXIYdLK/2tN8qosNMmVj74ok U9q6pPCXkGgl6JtqIOxuKGFynrSv7VfNwcN9981vA97M5Wth3Js+OVd6eTloY9NL1p/a YMyWlCVoGQStgtZRUoKHfZlmmtkz/bBvbrntI6lFNgUVkU2YuioBqEC7eGel8rdjz76+ 9/bQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:organization:message-id:date:subject:cc:to :from:dkim-signature:arc-authentication-results; bh=3SvWXvLKDYknF24pra7ZwBOwFL9GEcAqWArWsIaslY0=; b=tNijRfYHp3O2HlIsftKINVjVVg4GN9nanOQavMZO3Lb7Losy8q/0fru0toM2v+S0ou sXM1TdtvyHlUDAqDJjDNAXbNi7ElWOBwNjpDkMI3hS2v3EWG3U9FWG4+L7wvMNUWynZg PVQgnrTv+6OlIMhoJtqSbknmnBgoF/SEaqEHnHYW9pV/L7Lf4Syanyz52hQTyPNhkG0n 31iWaUrzJViS0hGltdXQyd86tsCk7vlsSdl9BjfcaxCx0wQFO6rt238GsIoQ1iG7mqus g86R7roDdsW3623RMWo7WfLFr0g05ljVgA1/SUjoNm1O/DUBL81Tm3NHkiA8dtGppKKZ sVXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=aGqNZxyh; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z10-v6si807945pgh.310.2018.08.07.02.11.04; Tue, 07 Aug 2018 02:11:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=aGqNZxyh; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388495AbeHGLLi (ORCPT + 99 others); Tue, 7 Aug 2018 07:11:38 -0400 Received: from perceval.ideasonboard.com ([213.167.242.64]:52160 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727669AbeHGLLh (ORCPT ); Tue, 7 Aug 2018 07:11:37 -0400 Received: from avalon.localnet (dfj612ybrt5fhg77mgycy-3.rev.dnainternet.fi [IPv6:2001:14ba:21f5:5b00:2e86:4862:ef6a:2804]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 851C557; Tue, 7 Aug 2018 10:58:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1533632296; bh=L97uAOX/zvAAhmzGW7D0oNuXyR8FEE6sFEJHWIDtvmM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aGqNZxyhb2uLiC1mL2NMHznvCU4nUywlIlZK1rKcxl7Ep1sOketncFIBbOhj1W06O zQG5qyPONqD3uMkVg6pnYZpU7RU7vuhTWZiiULABd/1qa2KKcRIJEMawQP7Bkx0vcL Z/vVCtVTkRPiQY6tp98Rk9B7szA/FjJQh93O2AlA= From: Laurent Pinchart To: Nadav Amit Cc: Mauro Carvalho Chehab , "linux-media@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH] usb: fix uvc_alloc_entity() allocation alignment Date: Tue, 07 Aug 2018 11:59:01 +0300 Message-ID: <3561796.imRZE4xQI7@avalon> Organization: Ideas on Board Oy In-Reply-To: <0B044CD5-B4F5-4614-B97A-E02E5C1E8A17@vmware.com> References: <20180604134713.101064-1-namit@vmware.com> <15813968.YrTFj7ZbY9@avalon> <0B044CD5-B4F5-4614-B97A-E02E5C1E8A17@vmware.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Nadav, On Tuesday, 7 August 2018 03:58:05 EEST Nadav Amit wrote: > at 4:58 PM, Laurent Pinchart wrote: > > On Monday, 4 June 2018 16:47:13 EEST Nadav Amit wrote: > >=20 > >> 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. > >>=20 > >> Found by a static assertion. Compile-tested only. > >>=20 > >> Fixes: 4ffc2d89f38a ("uvcvideo: Register subdevices for each entity") > >>=20 > >> Cc: Laurent Pinchart > >> Cc: Mauro Carvalho Chehab > >> Cc: linux-media@vger.kernel.org > >> Cc: linux-kernel@vger.kernel.org > >>=20 > >> Signed-off-by: Nadav Amit > >> --- > >> drivers/media/usb/uvc/uvc_driver.c | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > >>=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 typ= e, > >> u8 id, > >> unsigned int size; > >> unsigned int i; > >>=20 > >> - extra_size =3D ALIGN(extra_size, sizeof(*entity->pads)); > >> + extra_size =3D roundup(extra_size, sizeof(*entity->pads)); > >> num_inputs =3D (type & UVC_TERM_OUTPUT) ? num_pads : num_pads - 1; > >> size =3D sizeof(*entity) + extra_size + sizeof(*entity->pads) * num_p= ads > >> + num_inputs; > >=20 > > The purpose of this alignment is to make sure that entity->pads will be= =20 > > properly aligned. In theory the size of uvc_entity should be taken into= =20 > > 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 ? >=20 >=20 > Thanks. It=E2=80=99s been a while. Anyhow, I don=E2=80=99t know how =E2= =80=9Chot=E2=80=9D this code is, but > roundup uses a div operations, so if it is =E2=80=9Chot=E2=80=9D you may = want a different > way to align with lower overhead. >=20 > I presume it is not=E2=80=A6 You're right, it isn't. I'll include this patch in my next pull request for= =20 v4.20. =2D-=20 Regards, Laurent Pinchart