This is a note to let you know that I've just added the patch titled
ALSA: usb-audio: Fix a missing error check in scarlett gen2 mixer
to the 5.14-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-a-missing-error-check-in-scarlett-gen2-mixer.patch
and it can be found in the queue-5.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 8ec59ac3ad29891c0afef627640df36f2daa0349 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@xxxxxxx>
Date: Wed, 29 Sep 2021 09:35:40 +0200
Subject: ALSA: usb-audio: Fix a missing error check in scarlett gen2 mixer
From: Takashi Iwai <tiwai@xxxxxxx>
commit 8ec59ac3ad29891c0afef627640df36f2daa0349 upstream.
The check of the returned error code is missing in
scarlett2_update_monitor_other(). Let's fix it.
Fixes: d5bda7e03982 ("ALSA: usb-audio: scarlett2: Add support for the talkback feature")
Reported-by: kernel test robot <lkp@xxxxxxxxx>
Cc: <stable@xxxxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/202109131831.9IodEzRx-lkp@xxxxxxxxx
Link: https://lore.kernel.org/r/20210929073540.9611-1-tiwai@xxxxxxx
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
sound/usb/mixer_scarlett_gen2.c | 2 ++
1 file changed, 2 insertions(+)
--- a/sound/usb/mixer_scarlett_gen2.c
+++ b/sound/usb/mixer_scarlett_gen2.c
@@ -2450,6 +2450,8 @@ static int scarlett2_update_monitor_othe
err = scarlett2_usb_get_config(mixer,
SCARLETT2_CONFIG_TALKBACK_MAP,
1, &bitmap);
+ if (err < 0)
+ return err;
for (i = 0; i < num_mixes; i++, bitmap >>= 1)
private->talkback_map[i] = bitmap & 1;
}
Patches currently in stable-queue which might be from tiwai@xxxxxxx are
queue-5.14/alsa-pcm-workaround-for-a-wrong-offset-in-sync_ptr-compat-ioctl.patch
queue-5.14/alsa-hda-realtek-fix-the-mic-type-detection-issue-for-asus-g551jw.patch
queue-5.14/alsa-hda-realtek-add-quirk-for-clevo-x170km-g.patch
queue-5.14/alsa-hda-realtek-alc236-headset-mic-recording-issue.patch
queue-5.14/alsa-usb-audio-fix-a-missing-error-check-in-scarlett-gen2-mixer.patch
queue-5.14/alsa-hda-realtek-fix-for-quirk-to-enable-speaker-output-on-the-lenovo-13s-gen2.patch
queue-5.14/alsa-hda-realtek-add-quirk-for-tongfang-phxtxx1.patch
queue-5.14/alsa-usb-audio-add-quirk-for-vf0770.patch
queue-5.14/alsa-hda-enable-headphone-mic-on-dell-latitude-laptops-with-alc3254.patch
queue-5.14/alsa-seq-fix-a-potential-uaf-by-wrong-private_free-call-order.patch
queue-5.14/alsa-hda-realtek-complete-partial-device-name-to-avoid-ambiguity.patch
queue-5.14/alsa-hda-realtek-enable-4-speaker-output-for-dell-precision-5560-laptop.patch
