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 C8587C433EF for ; Tue, 28 Jun 2022 02:19:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243360AbiF1CTP (ORCPT ); Mon, 27 Jun 2022 22:19:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243035AbiF1CS7 (ORCPT ); Mon, 27 Jun 2022 22:18:59 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9DBA3248C7; Mon, 27 Jun 2022 19:18:53 -0700 (PDT) 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 dfw.source.kernel.org (Postfix) with ESMTPS id 292EA617BB; Tue, 28 Jun 2022 02:18:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6DCD8C34115; Tue, 28 Jun 2022 02:18:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1656382732; bh=Xkb0VAVnJd5IRM7nock+vyU/sDGgNuk4ZOFBIVhKWjs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ao6Kdh3GTqFnHAAFrdCLZyB2Fm8GgiveBTV0WVj+rS0+3cfzUnBulMg1zRBhUso1v jDUdnsFXYHJYMFU7RdpFz4BvXqBhPhyoy7o77GHoMAEgXxJTGJxHDAB+dPrFWffNWS y1rj7yXnGY7FO3FHfqAAoTwzmYRTLawDkOspeNXod7vdCE7ir6kh2RW+Y7oZNQ58LZ TF1WEHm2tdt7WLTxdinumZRWV3PZUYuniDkHx1pmvySbcK9oSC9AkAdthFDhgGWjSJ VKttOFFnxUwMnAsG/R4kenC7bY1Z8oDnmxYXew7ojCC/k5MMSdnnYQFxcep+Enh/ta S0m6oRmcMX5ag== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Daniil Dementev , Alexey Khoroshilov , Takashi Iwai , Sasha Levin , perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 5.18 06/53] ALSA: usb-audio: US16x08: Move overflow check before array access Date: Mon, 27 Jun 2022 22:17:52 -0400 Message-Id: <20220628021839.594423-6-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220628021839.594423-1-sashal@kernel.org> References: <20220628021839.594423-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: Daniil Dementev [ Upstream commit 3ddbe35d9a2ebd4924d458e0246b4ba6c13bb456 ] Buffer overflow could occur in the loop "while", due to accessing an array element before checking the index. Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Daniil Dementev Reviewed-by: Alexey Khoroshilov Link: https://lore.kernel.org/r/20220610165732.2904-1-d.dementev@ispras.ru Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/usb/mixer_us16x08.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/usb/mixer_us16x08.c b/sound/usb/mixer_us16x08.c index b7b6f3834ed5..6eb7d93b358d 100644 --- a/sound/usb/mixer_us16x08.c +++ b/sound/usb/mixer_us16x08.c @@ -637,10 +637,10 @@ static int snd_get_meter_comp_index(struct snd_us16x08_meter_store *store) } } else { /* skip channels with no compressor active */ - while (!store->comp_store->val[ + while (store->comp_index <= SND_US16X08_MAX_CHANNELS + && !store->comp_store->val[ COMP_STORE_IDX(SND_US16X08_ID_COMP_SWITCH)] - [store->comp_index - 1] - && store->comp_index <= SND_US16X08_MAX_CHANNELS) { + [store->comp_index - 1]) { store->comp_index++; } ret = store->comp_index++; -- 2.35.1