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 5E4DEEEB565 for ; Sat, 9 Sep 2023 00:43:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236287AbjIIAnK (ORCPT ); Fri, 8 Sep 2023 20:43:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346041AbjIIAl5 (ORCPT ); Fri, 8 Sep 2023 20:41:57 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 71BDF3589; Fri, 8 Sep 2023 17:39:57 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7313DC433B7; Sat, 9 Sep 2023 00:39:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694219997; bh=AkuarkZMuJJZPf+ahKIOj9/X2xOBJEBgJWmh7M136CE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a4uDxwn9LeB9WoE5Q8tz1WSfaAipV1yzwzZlDdElwnYK4R1tLPpNuJLO5FQMQ2WM5 m1M3R4LGH/CKDfoKDS7+XKTPcizX+Hnqx3jqYnKAbHxpQf26Rc33Mdxpwtl4BAFRfN gyqXhqPM9iBkpUpYBdDt4pb1Zbz1zXGxIYKGM6kiuLcgJLT7/VqRJfL+o2nHnpqUhL oNBEEhKK9sdc9pa7CVn8rnULLmMEp8UrymMzj2o1bjaebFsyZdDvkYIUqxeO4FfoOg knabxEhmJUUBDBDERPezEYn9dLEiT6QBDgDnl7/y3znD5N7Fxl8ErAIIjaP0tnlsIh bNKkwbx01RcGQ== 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 5.10 08/16] media: tuners: qt1010: replace BUG_ON with a regular error Date: Fri, 8 Sep 2023 20:39:33 -0400 Message-Id: <20230909003941.3580631-8-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230909003941.3580631-1-sashal@kernel.org> References: <20230909003941.3580631-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.10.194 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