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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 96425ECAAD8 for ; Wed, 14 Sep 2022 09:07:03 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id CC24E182B; Wed, 14 Sep 2022 11:06:11 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz CC24E182B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1663146421; bh=rHAHR2XTteJAvED1oYJQjJme79PljEJtZKFbBA++YOM=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=S+57YvY0EsBh7p7wRsLJm9qquAa1AnKGopKnfSPTFIRAKmPHqcgFAP037LMo4j0JW B/u2q5WGutUGyjv0LW1sbeK+yJuwTB1CP8y2OumsGnEZEXQ9m8mq9std4SEERA48fS U4LWVljxxc1Fsn/KNX8NseZ8d4dk8zzHmi9v5a7k= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id A0AC3F8053C; Wed, 14 Sep 2022 11:04:39 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id A03F3F80579; Wed, 14 Sep 2022 11:04:38 +0200 (CEST) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 54E8DF800FE for ; Wed, 14 Sep 2022 11:04:32 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 54E8DF800FE Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="UdnzBFVa" 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 E9249619F4; Wed, 14 Sep 2022 09:04:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9681FC433C1; Wed, 14 Sep 2022 09:04:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1663146270; bh=rHAHR2XTteJAvED1oYJQjJme79PljEJtZKFbBA++YOM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UdnzBFVaXhzMmcQ1U/yoKjpt+t9PRZ6Gp3uWY42TMJPXD3dTgzXf52T4IgW3WV6FS kt7E6KugsUekQ7I04mYBWs4Ybq6cEMseVf7/NTGShPPotYQzsWChBUCUvTD1gHvNCR MFD+AyxNQyb+7oDTQq7R/t09XrOkH+fujZkPWVS5q5N6W7VKkkIBKEDVaOXotkB8O2 5GX/Dft18jwYcnYXsLutBk89Y+7A1Ut/E5+KAUQiD0vRnbbx+yIRX+KKaW0w2R1oyg q+vpDyggA8qAtHlrq3WXDRUmwKYHxecr6S9iPBrJhwzoA7C120CFMjyOaEZhJ7C5wR eeCp3onIC7kLg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 07/12] ALSA: usb-audio: Fix an out-of-bounds bug in __snd_usb_parse_audio_interface() Date: Wed, 14 Sep 2022 05:04:00 -0400 Message-Id: <20220914090407.471328-7-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220914090407.471328-1-sashal@kernel.org> References: <20220914090407.471328-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Cc: Sasha Levin , alsa-devel@alsa-project.org, Dongxiang Ke , Takashi Iwai , tiwai@suse.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" From: Dongxiang Ke [ Upstream commit e53f47f6c1a56d2af728909f1cb894da6b43d9bf ] There may be a bad USB audio device with a USB ID of (0x04fa, 0x4201) and the number of it's interfaces less than 4, an out-of-bounds read bug occurs when parsing the interface descriptor for this device. Fix this by checking the number of interfaces. Signed-off-by: Dongxiang Ke Link: https://lore.kernel.org/r/20220906024928.10951-1-kdx.glider@gmail.com Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/usb/stream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/usb/stream.c b/sound/usb/stream.c index eff1ac1dc9ba3..d35684e5f07f0 100644 --- a/sound/usb/stream.c +++ b/sound/usb/stream.c @@ -1103,7 +1103,7 @@ static int __snd_usb_parse_audio_interface(struct snd_usb_audio *chip, * Dallas DS4201 workaround: It presents 5 altsettings, but the last * one misses syncpipe, and does not produce any sound. */ - if (chip->usb_id == USB_ID(0x04fa, 0x4201)) + if (chip->usb_id == USB_ID(0x04fa, 0x4201) && num >= 4) num = 4; for (i = 0; i < num; i++) { -- 2.35.1 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 C8A7BECAAD8 for ; Wed, 14 Sep 2022 09:11:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231417AbiINJLu (ORCPT ); Wed, 14 Sep 2022 05:11:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36884 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231274AbiINJLD (ORCPT ); Wed, 14 Sep 2022 05:11:03 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D7CE74E2A; Wed, 14 Sep 2022 02:05:07 -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 sin.source.kernel.org (Postfix) with ESMTPS id 1040ECE1397; Wed, 14 Sep 2022 09:04:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9681FC433C1; Wed, 14 Sep 2022 09:04:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1663146270; bh=rHAHR2XTteJAvED1oYJQjJme79PljEJtZKFbBA++YOM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UdnzBFVaXhzMmcQ1U/yoKjpt+t9PRZ6Gp3uWY42TMJPXD3dTgzXf52T4IgW3WV6FS kt7E6KugsUekQ7I04mYBWs4Ybq6cEMseVf7/NTGShPPotYQzsWChBUCUvTD1gHvNCR MFD+AyxNQyb+7oDTQq7R/t09XrOkH+fujZkPWVS5q5N6W7VKkkIBKEDVaOXotkB8O2 5GX/Dft18jwYcnYXsLutBk89Y+7A1Ut/E5+KAUQiD0vRnbbx+yIRX+KKaW0w2R1oyg q+vpDyggA8qAtHlrq3WXDRUmwKYHxecr6S9iPBrJhwzoA7C120CFMjyOaEZhJ7C5wR eeCp3onIC7kLg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dongxiang Ke , Takashi Iwai , Sasha Levin , perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 5.4 07/12] ALSA: usb-audio: Fix an out-of-bounds bug in __snd_usb_parse_audio_interface() Date: Wed, 14 Sep 2022 05:04:00 -0400 Message-Id: <20220914090407.471328-7-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220914090407.471328-1-sashal@kernel.org> References: <20220914090407.471328-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: stable@vger.kernel.org From: Dongxiang Ke [ Upstream commit e53f47f6c1a56d2af728909f1cb894da6b43d9bf ] There may be a bad USB audio device with a USB ID of (0x04fa, 0x4201) and the number of it's interfaces less than 4, an out-of-bounds read bug occurs when parsing the interface descriptor for this device. Fix this by checking the number of interfaces. Signed-off-by: Dongxiang Ke Link: https://lore.kernel.org/r/20220906024928.10951-1-kdx.glider@gmail.com Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/usb/stream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/usb/stream.c b/sound/usb/stream.c index eff1ac1dc9ba3..d35684e5f07f0 100644 --- a/sound/usb/stream.c +++ b/sound/usb/stream.c @@ -1103,7 +1103,7 @@ static int __snd_usb_parse_audio_interface(struct snd_usb_audio *chip, * Dallas DS4201 workaround: It presents 5 altsettings, but the last * one misses syncpipe, and does not produce any sound. */ - if (chip->usb_id == USB_ID(0x04fa, 0x4201)) + if (chip->usb_id == USB_ID(0x04fa, 0x4201) && num >= 4) num = 4; for (i = 0; i < num; i++) { -- 2.35.1