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 D84E0EEB565 for ; Sat, 9 Sep 2023 00:44:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234274AbjIIAo4 (ORCPT ); Fri, 8 Sep 2023 20:44:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346094AbjIIAoP (ORCPT ); Fri, 8 Sep 2023 20:44:15 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8476B46B6; Fri, 8 Sep 2023 17:41:46 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4E36FC116AA; Sat, 9 Sep 2023 00:41:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694220091; bh=0MgmUr+0rvyOwhHlKfOEyvJLQWR0hSq/OqTYGa+Hync=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vlo1FPDxGskJur7oLKFAMDocx4nQ/Q6eILIUYVKRpO2wLSla1sdcg3xUX55uWvOto m/tz/lfBsqtlR1pycoIsDOiWCqUD4S/fgrTR0C5o7vNrk2/XiZ6tTXXHQOgb2DbBKR gyVukYrfBAlHajNo8vmp8W9Bfr6j3VsMiApFZEd6YqkNHQNLZrhIJVS84bR1Kw0qHr AKWQS7J83C1JYQ0BEaC3C7RUiEw34t7P/yeOlXXU3qpWZrrQKi21NtxqQJNQ+jIPWL MnZng5tpeCpv5/NRCRBOvo2QHoMuzCFWloWWMgKeoV2yFxoi42yfGs3WE3MRlWSQRF ZbmvkwrIi+WHQ== 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 4.14 07/12] media: tuners: qt1010: replace BUG_ON with a regular error Date: Fri, 8 Sep 2023 20:41:10 -0400 Message-Id: <20230909004115.3581195-7-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230909004115.3581195-1-sashal@kernel.org> References: <20230909004115.3581195-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 4.14.325 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@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 ee33b7cc76824..b33f2321c94ce 100644 --- a/drivers/media/tuners/qt1010.c +++ b/drivers/media/tuners/qt1010.c @@ -351,11 +351,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