Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39F2DC2BCA1 for ; Fri, 7 Jun 2019 15:43:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0742A2147A for ; Fri, 7 Jun 2019 15:43:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559922195; bh=BDB3ig0QlMOY4R06RNujJ6k6tWZKmQbZv1OOduIroVM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=jC4a6oGBAMsV3Qaxz1vQ00RU9AwXdTMkUQXIp2a1+SJ+4/qzMW36zywHmTB4TyZZg 55y+5LIEEWQNHjRKogo00B/rTsmyAQr9/JnRN6ld6oprE7HGrkldyn3k2+QICvvPgh I0hbk5K0zQfvrV0cHorGoWqOSjjXUj+W/1XeAopk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729851AbfFGPnN (ORCPT ); Fri, 7 Jun 2019 11:43:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:54280 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730798AbfFGPnM (ORCPT ); Fri, 7 Jun 2019 11:43:12 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CA4312147A; Fri, 7 Jun 2019 15:43:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559922192; bh=BDB3ig0QlMOY4R06RNujJ6k6tWZKmQbZv1OOduIroVM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rCUOXf20M4ge31aZBR+TtQ6rTfGxFsmbZ3nEGqct03UuQIPCfLUtVQKozsOaqHKEI tQ39o7RIzAT8N0CYcEc1tLcrT+jyEOoB69IDjT+cjtgszHpsTu1d6iYcPGIJz/b81e 0BRJW5eNDW8NiDqLUNeQ3BglVXgomPAHyCQBcP6M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nadav Amit , Laurent Pinchart , Mauro Carvalho Chehab , Doug Anderson , Ben Hutchings Subject: [PATCH 4.14 69/69] media: uvcvideo: Fix uvc_alloc_entity() allocation alignment Date: Fri, 7 Jun 2019 17:39:50 +0200 Message-Id: <20190607153856.262197244@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190607153848.271562617@linuxfoundation.org> References: <20190607153848.271562617@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Nadav Amit 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: 4ffc2d89f38a ("uvcvideo: Register subdevices for each entity") Signed-off-by: Nadav Amit Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab Cc: Doug Anderson Cc: Ben Hutchings Signed-off-by: Greg Kroah-Hartman --- drivers/media/usb/uvc/uvc_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -903,7 +903,7 @@ static struct uvc_entity *uvc_alloc_enti 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;