This is a note to let you know that I've just added the patch titled
ALSA: usb-audio: Fix regression on detection of Roland VS-100
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
alsa-usb-audio-fix-regression-on-detection-of-roland-vs-100.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From fa4e7a6fa12b1132340785e14bd439cbe95b7a5a Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@xxxxxxx>
Date: Fri, 24 Mar 2023 08:50:05 +0100
Subject: ALSA: usb-audio: Fix regression on detection of Roland VS-100
From: Takashi Iwai <tiwai@xxxxxxx>
commit fa4e7a6fa12b1132340785e14bd439cbe95b7a5a upstream.
It's been reported that the recent kernel can't probe the PCM devices
on Roland VS-100 properly, and it turned out to be a regression by the
recent addition of the bit shift range check for the format bits.
In the old code, we just did bit-shift and it resulted in zero, which
is then corrected to the standard PCM format, while the new code
explicitly returns an error in such a case.
For addressing the regression, relax the check and fallback to the
standard PCM type (with the info output).
Fixes: 43d5ca88dfcd ("ALSA: usb-audio: Fix potential out-of-bounds shift")
Cc: <stable@xxxxxxxxxxxxxxx>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=217084
Link: https://lore.kernel.org/r/20230324075005.19403-1-tiwai@xxxxxxx
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
sound/usb/format.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
--- a/sound/usb/format.c
+++ b/sound/usb/format.c
@@ -39,8 +39,12 @@ static u64 parse_audio_format_i_type(str
case UAC_VERSION_1:
default: {
struct uac_format_type_i_discrete_descriptor *fmt = _fmt;
- if (format >= 64)
- return 0; /* invalid format */
+ if (format >= 64) {
+ usb_audio_info(chip,
+ "%u:%d: invalid format type 0x%llx is detected, processed as PCM\n",
+ fp->iface, fp->altsetting, format);
+ format = UAC_FORMAT_TYPE_I_PCM;
+ }
sample_width = fmt->bBitResolution;
sample_bytes = fmt->bSubframeSize;
format = 1ULL << format;
Patches currently in stable-queue which might be from tiwai@xxxxxxx are
queue-6.1/alsa-ymfpci-create-card-with-device-managed-snd_devm.patch
queue-6.1/alsa-hda-conexant-partial-revert-of-a-quirk-for-lenovo.patch
queue-6.1/alsa-hda-realtek-add-quirks-for-some-clevo-laptops.patch
queue-6.1/alsa-hda-ca0132-fixup-buffer-overrun-at-tuning_ctl_s.patch
queue-6.1/alsa-usb-audio-fix-recursive-locking-at-xrun-during-.patch
queue-6.1/alsa-ymfpci-fix-bug_on-in-probe-function.patch
queue-6.1/alsa-asihpi-check-pao-in-control_message.patch
queue-6.1/alsa-hda-realtek-add-quirk-for-lenovo-zhaoyang-cf4620z.patch
queue-6.1/alsa-usb-audio-fix-regression-on-detection-of-roland-vs-100.patch
