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 B4138CCA47B for ; Tue, 28 Jun 2022 02:25:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244385AbiF1CZL (ORCPT ); Mon, 27 Jun 2022 22:25:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32860 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244140AbiF1CXJ (ORCPT ); Mon, 27 Jun 2022 22:23:09 -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 5CB5024F0C; Mon, 27 Jun 2022 19:22:51 -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 EA8926184B; Tue, 28 Jun 2022 02:22:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3EDDAC341CC; Tue, 28 Jun 2022 02:22:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1656382970; bh=JLS2vc7eT3IroK7sfnXoArGiiUkK3Td1ggulnMuXfEg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bwQKNwQrDpguPbtZ8wSi3TTo/oPtfVl6FpTN8WDnloU0rki6vKUti5wPtiGV9GRCr cod8yz8S2e6p0Xh6UhtLxWr1l01tjgyWdtxX1VVnJ9Mb/SAnonKT2TkDI2ySG0pL2l tJeokpC5mS/+Wmfs8Vxt0Rj6M218Biwh6yhW2e3eUY1Zqll57ziDyuTefXV9RTAAug GRN7Xx0EXAlEUi7nijeSsTifRcLptyMwVWYEqprUvv0LVKR6yDzyJRr81DOX0imP+S LQ8kC0Zl/V1flEUV3N6j66M0uDwsApSkzKc2ZM6rwwIktINfvDm9UXc2n9ma+SgNWa j7ekp2UsV4vqw== 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.10 04/34] ALSA: usb-audio: US16x08: Move overflow check before array access Date: Mon, 27 Jun 2022 22:22:11 -0400 Message-Id: <20220628022241.595835-4-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220628022241.595835-1-sashal@kernel.org> References: <20220628022241.595835-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 bd63a9ce6a70..71f6186edcdd 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