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 350FDC4332F for ; Sat, 24 Dec 2022 01:34:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236513AbiLXBeZ (ORCPT ); Fri, 23 Dec 2022 20:34:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236534AbiLXBdY (ORCPT ); Fri, 23 Dec 2022 20:33:24 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1925940829; Fri, 23 Dec 2022 17:31:18 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 6DAC4B8219D; Sat, 24 Dec 2022 01:31:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2DEE1C433D2; Sat, 24 Dec 2022 01:31:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671845476; bh=lQ5K7ti7ooaQbz7h7OzPaF6tCLSFNqN5Idal7gXxsko=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Dab2y1jhlmJsYcEdYCNXGOhE5ysHtaGVAdQKM5eIgQxq3pENJSaoi5kvqk1jjTMm/ 6ZyV6l9nyccxQactqRv85dbAOYZKaQad1hbHYx3Dl5Z5BWXx05+lIdgJEeccQ1a3pq XqNoD7+9ZLgaueGQ4UulAWbyA83v9y3IiB/O3+lN4sccT8TAE8dK8v3mingv/nCvLb 36xtLkbG4O1zyNbrrIvPSpa2np29n+XlbfZWNPe9MoaZNxkcD5Tv7QIEOUfW9MDV6t 95egpGZn++mFBfqYUSzyAkoNz2ZYGdSzZy2A8Tu0ZFeRMtcyGTCjVd+AW7EGaQeCCl wWkQGOggtMJMQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wei Yongjun , Antoniu Miclaus , Jonathan Cameron , Sasha Levin , lars@metafoo.de, Michael.Hennerich@analog.com, jic23@kernel.org, linux-iio@vger.kernel.org Subject: [PATCH AUTOSEL 6.0 12/18] iio: filter: admv8818: close potential out-of-bounds read in __admv8818_read_[h|l]pf_freq() Date: Fri, 23 Dec 2022 20:30:28 -0500 Message-Id: <20221224013034.392810-12-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221224013034.392810-1-sashal@kernel.org> References: <20221224013034.392810-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wei Yongjun [ Upstream commit 3f4033a811bcd1a1f077ce5297488a5c4dd30eb1 ] ADMV8818_SW_IN_WR0_MSK and ADMV8818_SW_OUT_WR0_MSK have 3 bits, which means a length of 8, but freq_range_hpf and freq_range_lpf array size is 4, may end up reading 4 elements beyond the end of those arrays. Check value first before access freq_range_hpf and freq_range_lpf to harden against the hardware allowing out of range values. Signed-off-by: Wei Yongjun Reviewed-by: Antoniu Miclaus Link: https://lore.kernel.org/r/20220922115848.1800021-1-weiyongjun@huaweicloud.com Signed-off-by: Jonathan Cameron Signed-off-by: Sasha Levin --- drivers/iio/filter/admv8818.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/iio/filter/admv8818.c b/drivers/iio/filter/admv8818.c index 68de45fe21b4..fe8d46cb7f1d 100644 --- a/drivers/iio/filter/admv8818.c +++ b/drivers/iio/filter/admv8818.c @@ -265,7 +265,7 @@ static int __admv8818_read_hpf_freq(struct admv8818_state *st, u64 *hpf_freq) return ret; hpf_band = FIELD_GET(ADMV8818_SW_IN_WR0_MSK, data); - if (!hpf_band) { + if (!hpf_band || hpf_band > 4) { *hpf_freq = 0; return ret; } @@ -303,7 +303,7 @@ static int __admv8818_read_lpf_freq(struct admv8818_state *st, u64 *lpf_freq) return ret; lpf_band = FIELD_GET(ADMV8818_SW_OUT_WR0_MSK, data); - if (!lpf_band) { + if (!lpf_band || lpf_band > 4) { *lpf_freq = 0; return ret; } -- 2.35.1