]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ALSA: usb-audio: Fix OOB access at proc output
authorTakashi Iwai <tiwai@suse.de>
Tue, 22 Jun 2021 09:06:47 +0000 (11:06 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Jul 2021 14:15:38 +0000 (16:15 +0200)
commit 362372ceb6556f338e230f2d90af27b47f82365a upstream.

At extending the available mixer values for 32bit types, we forgot to
add the corresponding entries for the format dump in the proc output.
This may result in OOB access.  Here adds the missing entries.

Fixes: bc18e31c3042 ("ALSA: usb-audio: Fix parameter block size for UAC2 control requests")
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20210622090647.14021-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/usb/mixer.c

index 4ad6eeb43476b6ba308b30bfbd093399c59a6a96..6c8cdce8156bee84088ea46d691f69cdb4a10851 100644 (file)
@@ -3260,8 +3260,9 @@ static void snd_usb_mixer_dump_cval(struct snd_info_buffer *buffer,
                                    struct usb_mixer_elem_list *list)
 {
        struct usb_mixer_elem_info *cval = mixer_elem_list_to_info(list);
-       static const char * const val_types[] = {"BOOLEAN", "INV_BOOLEAN",
-                                   "S8", "U8", "S16", "U16"};
+       static const char * const val_types[] = {
+               "BOOLEAN", "INV_BOOLEAN", "S8", "U8", "S16", "U16", "S32", "U32",
+       };
        snd_iprintf(buffer, "    Info: id=%i, control=%i, cmask=0x%x, "
                            "channels=%i, type=\"%s\"\n", cval->head.id,
                            cval->control, cval->cmask, cval->channels,