From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3010CEEB565 for ; Sat, 9 Sep 2023 00:40:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239092AbjIIAkf (ORCPT ); Fri, 8 Sep 2023 20:40:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345936AbjIIAjl (ORCPT ); Fri, 8 Sep 2023 20:39:41 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F752269F; Fri, 8 Sep 2023 17:38:56 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C987BC433A9; Sat, 9 Sep 2023 00:38:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694219917; bh=AkuarkZMuJJZPf+ahKIOj9/X2xOBJEBgJWmh7M136CE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ko+V1UEoxIYIJXH0mh7C4Q3oo5wMzaJmio9QFPMxJCzZ4JkbdRD22itlIliyZb1XH nwYgNmJlp0efKDK0rfmzN0QKYa+EQ+Eb/K8vWpZTetyXzNsPKIQ5KN00nS/cWIDRo1 XcxipaGqRzi/qVgaPGnGO3/pDGtoWnsas9tG3eqcu+0MvC4ksaRouBkvHu9zWgsGV3 plNuiv9kTQ5rVle1jEEtLsiH/1f3RqhQ5RXIxJfBg3drs9mUpbGtaRPqtULpfT1acf 7daaZbS3SZx6GtXJ6XZKZgnFd3w5DW6cyhii0aaWd2WOKTH43jSBTQR1tKa/V3cjmj NKK0bS4DZmubA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hans Verkuil , Sasha Levin , crope@iki.fi, mchehab@kernel.org, linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 10/24] media: tuners: qt1010: replace BUG_ON with a regular error Date: Fri, 8 Sep 2023 20:38:02 -0400 Message-Id: <20230909003818.3580081-10-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230909003818.3580081-1-sashal@kernel.org> References: <20230909003818.3580081-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.52 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hans Verkuil [ Upstream commit ee630b29ea44d1851bb6c903f400956604834463 ] BUG_ON is unnecessary here, and in addition it confuses smatch. Replacing this with an error return help resolve this smatch warning: drivers/media/tuners/qt1010.c:350 qt1010_init() error: buffer overflow 'i2c_data' 34 <= 34 Signed-off-by: Hans Verkuil Signed-off-by: Sasha Levin --- drivers/media/tuners/qt1010.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/media/tuners/qt1010.c b/drivers/media/tuners/qt1010.c index 3853a3d43d4f2..a7b19863f489e 100644 --- a/drivers/media/tuners/qt1010.c +++ b/drivers/media/tuners/qt1010.c @@ -345,11 +345,12 @@ static int qt1010_init(struct dvb_frontend *fe) else valptr = &tmpval; - BUG_ON(i >= ARRAY_SIZE(i2c_data) - 1); - - err = qt1010_init_meas1(priv, i2c_data[i+1].reg, - i2c_data[i].reg, - i2c_data[i].val, valptr); + if (i >= ARRAY_SIZE(i2c_data) - 1) + err = -EIO; + else + err = qt1010_init_meas1(priv, i2c_data[i + 1].reg, + i2c_data[i].reg, + i2c_data[i].val, valptr); i++; break; } -- 2.40.1