Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp1138513ybn; Tue, 24 Sep 2019 15:30:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqz+xYjoozSvCL6sbAayFZFSg/uQ3h67J74aiYCbYBqAP0kc9e7SWTj8+9mzu4Kvu4oS03R2 X-Received: by 2002:a1c:f003:: with SMTP id a3mr3134419wmb.41.1569364254113; Tue, 24 Sep 2019 15:30:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569364254; cv=none; d=google.com; s=arc-20160816; b=TB9lzoQid3zpSJZWskg9+eRHKJNRcHjUE6mKfv2/MVjllEyKMzhwjF9GcHHjHjKLaX EulMSR6FwvR93bMT+BtwVrvbxZU0+ljgPVf8CSsd07ncYT7bheWobNGkRuU/SvGt0Ko5 bbyDhpTmP3re36XA29P5qxmOavM4JkeZ3OkkyOx+HEX3JR38aWroEDk1+bsOjof7D28J 5ulAaUzIBvdt6jMgJvTETaYuREXxwZyMyboYEVcyWppz9I1oPS5dxHjjlXb7ZnFxT5J4 sc53q+nxV4luE3tXipkZ8niEqxfvIEkVHcTwigG8YVM6ZUWNfzomiWHxvNEzP02Qtzrc cZ4Q== 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:message-id:date:subject:cc:to:from :dkim-signature; bh=AcQeUJsMRmix99PBHoyqP/RouSwW3gKH4d4JJbAgrrA=; b=NI1R1YAMPigFR3228QLwXXXcgxBHIIw0np5DatlEEiQUPDDeFN5FbObiQk1A4+NnA8 D0vr/JryAKwhumwj4oPZcRqCv7IR/0LgKPYfPKD/dMG/qeGsKYB6VGpH7UALHgdgoacA NtpQyfdGA1WWtMS2yIqXrZa5VchPk4TFgoj6LrENPWSyUAbqtjbT1TDneUe5iHqC9qe3 U3TzOBgB/ZEKXKsJzT3m/Ba+UQEg0ElSSQG+q81iYcdJXA/ig0H9j9tMn4SXejzgPV6S LrV6CyTnuIoASzjNNpTWYANnyuC0k3n3FsDul5j1Vxfv7UlZNwvnomUVxRFhbEutys6o E2ug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zYlnhOse; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x25si2084923edr.128.2019.09.24.15.29.57; Tue, 24 Sep 2019 15:30: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=zYlnhOse; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2438216AbfIVTde (ORCPT + 99 others); Sun, 22 Sep 2019 15:33:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:44046 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391012AbfIVSrf (ORCPT ); Sun, 22 Sep 2019 14:47:35 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F3C5D21D6C; Sun, 22 Sep 2019 18:47:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178054; bh=DdnHqTTMKKfCpDwlPlBDOYddiSHmslJNpMh4FwJwhwI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zYlnhOseF8RkN0o76SgWfDdxmiLvr1aKWwsdqdCJPZIalDfvyw7c53DtoXEci6PyO yq0huDowfihUaE4/CMRgricZRgEiKmyRXwpL4MbGWyCnG5z2lKjrJRcqlTU9KOhlKz QB1uVIBJSy1uhRcdesY7oDTEl9XHVCNBLUJbFJnE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mauro Carvalho Chehab , Sylwester Nawrocki , Sasha Levin , linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 5.3 131/203] media: ov9650: add a sanity check Date: Sun, 22 Sep 2019 14:42:37 -0400 Message-Id: <20190922184350.30563-131-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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 30ab2225fbd0c..b350f5c1a9890 100644 --- a/drivers/media/i2c/ov9650.c +++ b/drivers/media/i2c/ov9650.c @@ -703,6 +703,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