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 66F3FC433F5 for ; Tue, 19 Apr 2022 18:15:57 +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 8DA1E195A; Tue, 19 Apr 2022 20:15:05 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 8DA1E195A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1650392155; bh=cX1TogmjffYuRvjQ4kdQaH9bhy7dD4rK6n7EXly9OUI=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=V5y+PS3ferEgb/+ypp6JOs2/hK6ZONX3elSCoHt2jvpECj7/2uPILY1QTAnHzqvq4 IBy8MrBuZ+FpJnh2Rajsq2X6M6mYau9gYhp3gv44bXgXFTU9+ZZ1xgTAt6pGVr6y3W GMKHtNb0wwCvFAAaW9pVBEgF+CBnyAtNvyGz8t4g= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 36CA4F80121; Tue, 19 Apr 2022 20:15:05 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 9F40AF804A9; Tue, 19 Apr 2022 20:15:03 +0200 (CEST) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id AA66BF802E3 for ; Tue, 19 Apr 2022 20:14:57 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz AA66BF802E3 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="CijdQU8G" 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 4BC8D611A9; Tue, 19 Apr 2022 18:14:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ACE3EC385A5; Tue, 19 Apr 2022 18:14:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1650392095; bh=cX1TogmjffYuRvjQ4kdQaH9bhy7dD4rK6n7EXly9OUI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CijdQU8Gae4qlyOdhfYIZ7f4kSAeVrKREp+8d/pthRmSeanUsUNe/F0u3RGbHrhC1 vaZlvqONeIOyu/I86xj0x2yeLS5u0HcJEQClU3iNzwRJvnbwosJ8s2PfRwvKs4W4y7 b05bVQ+EP/pp67GXHRi4Q4YtZk3A+RuFm66DmjcYMJ/dXCNunMLdn6q3cFUOjW8wJY g2XpQ1CfgdmLE2puIq8c4Vf0JsE3AMsRtL0CfxyU3r0KFLyjudYpKYD6hylvlRQaiV JauFVMZEGg+vQ6EdNDoUtU5PdFhI8ihye2k4e6KdAl1JPCcz/hUjvZ9juxpOC2CSqr XATk4l59Qs67A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 04/14] ALSA: usb-audio: Fix undefined behavior due to shift overflowing the constant Date: Tue, 19 Apr 2022 14:14:33 -0400 Message-Id: <20220419181444.485959-4-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220419181444.485959-1-sashal@kernel.org> References: <20220419181444.485959-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Cc: Sasha Levin , alsa-devel@alsa-project.org, Takashi Iwai , tiwai@suse.com, Borislav Petkov 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: Borislav Petkov [ Upstream commit 1ef8715975de8bd481abbd0839ed4f49d9e5b0ff ] Fix: sound/usb/midi.c: In function ‘snd_usbmidi_out_endpoint_create’: sound/usb/midi.c:1389:2: error: case label does not reduce to an integer constant case USB_ID(0xfc08, 0x0101): /* Unknown vendor Cable */ ^~~~ See https://lore.kernel.org/r/YkwQ6%2BtIH8GQpuct@zn.tnic for the gory details as to why it triggers with older gccs only. [ A slight correction with parentheses around the argument by tiwai ] Signed-off-by: Borislav Petkov Link: https://lore.kernel.org/r/20220405151517.29753-3-bp@alien8.de Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/usb/usbaudio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h index ff97fdcf63bd..b1959e04cbb1 100644 --- a/sound/usb/usbaudio.h +++ b/sound/usb/usbaudio.h @@ -8,7 +8,7 @@ */ /* handling of USB vendor/product ID pairs as 32-bit numbers */ -#define USB_ID(vendor, product) (((vendor) << 16) | (product)) +#define USB_ID(vendor, product) (((unsigned int)(vendor) << 16) | (product)) #define USB_ID_VENDOR(id) ((id) >> 16) #define USB_ID_PRODUCT(id) ((u16)(id)) -- 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 85776C4332F for ; Tue, 19 Apr 2022 18:22:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357103AbiDSSZ2 (ORCPT ); Tue, 19 Apr 2022 14:25:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36922 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357001AbiDSSWe (ORCPT ); Tue, 19 Apr 2022 14:22:34 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE47917064; Tue, 19 Apr 2022 11:14:56 -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 4BFF661337; Tue, 19 Apr 2022 18:14:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ACE3EC385A5; Tue, 19 Apr 2022 18:14:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1650392095; bh=cX1TogmjffYuRvjQ4kdQaH9bhy7dD4rK6n7EXly9OUI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CijdQU8Gae4qlyOdhfYIZ7f4kSAeVrKREp+8d/pthRmSeanUsUNe/F0u3RGbHrhC1 vaZlvqONeIOyu/I86xj0x2yeLS5u0HcJEQClU3iNzwRJvnbwosJ8s2PfRwvKs4W4y7 b05bVQ+EP/pp67GXHRi4Q4YtZk3A+RuFm66DmjcYMJ/dXCNunMLdn6q3cFUOjW8wJY g2XpQ1CfgdmLE2puIq8c4Vf0JsE3AMsRtL0CfxyU3r0KFLyjudYpKYD6hylvlRQaiV JauFVMZEGg+vQ6EdNDoUtU5PdFhI8ihye2k4e6KdAl1JPCcz/hUjvZ9juxpOC2CSqr XATk4l59Qs67A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Borislav Petkov , Takashi Iwai , Sasha Levin , perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 5.4 04/14] ALSA: usb-audio: Fix undefined behavior due to shift overflowing the constant Date: Tue, 19 Apr 2022 14:14:33 -0400 Message-Id: <20220419181444.485959-4-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220419181444.485959-1-sashal@kernel.org> References: <20220419181444.485959-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Borislav Petkov [ Upstream commit 1ef8715975de8bd481abbd0839ed4f49d9e5b0ff ] Fix: sound/usb/midi.c: In function ‘snd_usbmidi_out_endpoint_create’: sound/usb/midi.c:1389:2: error: case label does not reduce to an integer constant case USB_ID(0xfc08, 0x0101): /* Unknown vendor Cable */ ^~~~ See https://lore.kernel.org/r/YkwQ6%2BtIH8GQpuct@zn.tnic for the gory details as to why it triggers with older gccs only. [ A slight correction with parentheses around the argument by tiwai ] Signed-off-by: Borislav Petkov Link: https://lore.kernel.org/r/20220405151517.29753-3-bp@alien8.de Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/usb/usbaudio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h index ff97fdcf63bd..b1959e04cbb1 100644 --- a/sound/usb/usbaudio.h +++ b/sound/usb/usbaudio.h @@ -8,7 +8,7 @@ */ /* handling of USB vendor/product ID pairs as 32-bit numbers */ -#define USB_ID(vendor, product) (((vendor) << 16) | (product)) +#define USB_ID(vendor, product) (((unsigned int)(vendor) << 16) | (product)) #define USB_ID_VENDOR(id) ((id) >> 16) #define USB_ID_PRODUCT(id) ((u16)(id)) -- 2.35.1