| From 734b1dc8d68a4eb6ca77bb5036d932b95d958820 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 5 Apr 2022 17:15:08 +0200 |
| Subject: ALSA: usb-audio: Fix undefined behavior due to shift overflowing the |
| constant |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Borislav Petkov <bp@suse.de> |
| |
| [ 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 <bp@suse.de> |
| Link: https://lore.kernel.org/r/20220405151517.29753-3-bp@alien8.de |
| Signed-off-by: Takashi Iwai <tiwai@suse.de> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| 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 62456a806bb4..4b8f1c46420d 100644 |
| --- a/sound/usb/usbaudio.h |
| +++ b/sound/usb/usbaudio.h |
| @@ -22,7 +22,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 |
| |
