Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp74832ybp; Thu, 3 Oct 2019 10:21:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqxnDlh8wMwO4qCs86LjCqIh+qne04Nh0Tswjc1wg27mbQtWcev8TIAz5jV4F0r78KTPJPZK X-Received: by 2002:aa7:c1d4:: with SMTP id d20mr10527201edp.223.1570123314570; Thu, 03 Oct 2019 10:21:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570123314; cv=none; d=google.com; s=arc-20160816; b=HaLJ36finlyL2ww4utqTgwXR0v7+yTx49Qcky+dfOvheqaBDI538Yi++3sXVreu3eo oE48u2ULk+7hz20phqDZkBjpq5SlZwYuoH/F/7kZDGznaxnDK8xTiCXMSbd1h6ayvC9r Qcep8FdW0FqOM+KvCsjsb358k05uB4CuB0IQFCh+DD+gl79ZIPKKcufOQxvZP1z3EpG2 o9yo1K8jpta28V0+9CAvHspYQazQWFP2XvHTFMP9aXDd1Am6JXGo2iP127hCKCYwUMOc AkVqfRXPCr3grAuwmttKPss/R/Mcyabf9Sub3ggVStVXsSW13E+lp8B52ZaETNm7kpzG yHXA== 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=96fH0GwN/KqO/W/MMotow+JiiMVnqidPNom2/gFNdSE=; b=r4X3uskn+ogaOx40Fgo+jhB7ECXIXVRRWnKuyAslgYnbdVcH9ZmSl8QqJuXvQXgcW7 aoaHMMod8VaNR/EjRGsvid9J4Af60nwvhdXP/f8W/Sl6xSnHR6pes9hc6lEJsLtabgH5 HSa8v1kfWHuo5XaGigCR96gDp/+nTxfv+M2BjR5WcK28fSrQddUJPGG1lAj4d7LVx45p kZN7SOjoAvFEJiNklEzyO7cMf0uDsCz61hI+RmzWOddQSAw6/+l7sGcaUIHZ3NdSo4sc sGKcWQtH105PV0ZZPnpVZgF1LBEk8sjclS6v7RSIocbJw77bUtoHH1ld18AdXbeBZ0JI /kMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xVsQ5p3u; 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 i9si1526122ejy.106.2019.10.03.10.21.30; Thu, 03 Oct 2019 10:21:54 -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=xVsQ5p3u; 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 S2390731AbfJCRUA (ORCPT + 99 others); Thu, 3 Oct 2019 13:20:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:46020 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388239AbfJCQTH (ORCPT ); Thu, 3 Oct 2019 12:19:07 -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 838EE21A4C; Thu, 3 Oct 2019 16:19:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570119547; bh=lAXoCvK9UQCg0kKCfkhoaIjzPBFySSpdewTqTsr5tNk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xVsQ5p3un3YSbiPrRw4it2OfkXzmOt5qrMslFD/9w2bpade0vVJpZ89B+pT147YHP HE1kegcwIFZeOPmcY6C4JEN1Nm4Oms4KsoUlOPQzysOVDY4VrSIryQhmojgRtk4E5x j3NNlnrp9blsj8FuY23jikErYWeY9Ag2B/plH1fA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sylwester Nawrocki , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.19 104/211] media: ov9650: add a sanity check Date: Thu, 3 Oct 2019 17:52:50 +0200 Message-Id: <20191003154510.531808346@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154447.010950442@linuxfoundation.org> References: <20191003154447.010950442@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: Mauro Carvalho Chehab [ Upstream commit 093347abc7a4e0490e3c962ecbde2dc272a8f708 ] As pointed by cppcheck: [drivers/media/i2c/ov9650.c:706]: (error) Shifting by a negative value is undefined behaviour [drivers/media/i2c/ov9650.c:707]: (error) Shifting by a negative value is undefined behaviour [drivers/media/i2c/ov9650.c:721]: (error) Shifting by a negative value is undefined behaviour Prevent mangling with gains with invalid values. As pointed by Sylvester, this should never happen in practice, as min value of V4L2_CID_GAIN control is 16 (gain is always >= 16 and m is always >= 0), but it is too hard for a static analyzer to get this, as the logic with validates control min/max is elsewhere inside V4L2 core. Reviewed-by: Sylwester Nawrocki Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/i2c/ov9650.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/media/i2c/ov9650.c b/drivers/media/i2c/ov9650.c index 5bea31cd41aa1..33a21d585dc9c 100644 --- a/drivers/media/i2c/ov9650.c +++ b/drivers/media/i2c/ov9650.c @@ -716,6 +716,11 @@ static int ov965x_set_gain(struct ov965x *ov965x, int auto_gain) for (m = 6; m >= 0; m--) if (gain >= (1 << m) * 16) break; + + /* Sanity check: don't adjust the gain with a negative value */ + if (m < 0) + return -EINVAL; + rgain = (gain - ((1 << m) * 16)) / (1 << m); rgain |= (((1 << m) - 1) << 4); -- 2.20.1