Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp345745ybi; Fri, 7 Jun 2019 09:00:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqyqtyRmGk6CsW2PCQzKBVkwYj+GC+UxxJ2JDgPHIsabvuSoAiGdGetVw9/qoT9aUXyu20+A X-Received: by 2002:aa7:8212:: with SMTP id k18mr10169539pfi.246.1559923214394; Fri, 07 Jun 2019 09:00:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559923214; cv=none; d=google.com; s=arc-20160816; b=AND7LEh6GlaF01jzkm65lIljQE+bKambnC6rR3lLcGI6bNdzucms8+ojK2EhNz+H9W ljydhHusOaRZhfefGvAGEgDqgH8IWJCsVWwAoixYOnO3fPdVMtU+ccskIMUmqgQf07Qq vfaGieukZl/bpr6viC9qfKzAEyT7C7zMCGpcGG14p5+Bep1z8De0anAu6Zek7sVBPQ14 9/ZYRmAFMK9FwBNbW/d0KGOpnERcpfu846FX9Ptqoei1tamU79+YgX6FQpaVcMgIApkj OuMRToUye+R2BdUclKLu6L7nl3C30mNyIZbuoQNuPzhMW+rP61rn7aJycKOmPan6NCvj hHLg== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ioCIZNEO4GwHZv+I2xDHJ0Xbwfu9QkPrzumPXHztF0I=; b=F3H8O42tlCPYZp/w0iFllZOK+cNCs7jvQG+vJN+TR9C8TZjIhUEH8YDA932ZD44TBM GyDYIxPOw6MzorP9QJEaCp974xJl2E5YjAf/DNYPKOP44/nr/vZNfRk5jhA5Q5326yZL ZKKcENaqAQFaY3P//NYcSOwff4g+K9tD0ffPWPsZs8/Mudk1NMP2K2OX3pHB224M0S1V J1qi6JFZfG6Xa4ssONp8wiRvgDKGpAL9IxYx1R6w4iBBkvdx6zrWQ6KcRAmD4lAxjLRZ MO/XU8uO2LkuV5TULBcaKCidv3rRUEPgxR1XC+ezSWYW9N7C/aKVHvMIF2quOinI0xwE NC9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=rCUOXf20; 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 q16si2073721pgc.422.2019.06.07.08.59.57; Fri, 07 Jun 2019 09:00:14 -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 header.i=@kernel.org header.s=default header.b=rCUOXf20; 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 S1730809AbfFGPnP (ORCPT + 99 others); Fri, 7 Jun 2019 11:43:15 -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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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;