mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-16 03:11:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: usb-audio: validate full match when resolving quirk aliases

Browse Source 
get_alias_quirk() resolves a quirk for an aliased USB ID by scanning
usb_audio_ids[], but it currently checks only the vendor/product pair.

This is weak for quirk table entries that also depend on additional
USB_DEVICE_ID match fields, such as device or interface class,
subclass, protocol, interface number, or bcdDevice range.

Keep the aliased vid:pid as the lookup key, then validate only the
remaining match criteria of each candidate entry against the real
device/interface descriptors by clearing USB_DEVICE_ID_MATCH_DEVICE
from a temporary copy and passing it to usb_match_one_id().

Suggested-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Cássio Gabriel <cassiogabrielcontato@gmail.com>
Link: https://patch.msgid.link/20260318-alsa-usb-fix-quirk-alias-v3-1-bd3b17a32939@gmail.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Cássio Gabriel
2026-03-18 11:08:46 -03:00
committed by Takashi Iwai
parent 785639b5bf
commit df3eec203b
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sound/usb/card.c
View File

@@ -866,19 +866,25 @@ static void find_last_interface(struct snd_usb_audio *chip)
/* look for the corresponding quirk */
static const struct snd_usb_audio_quirk *
get_alias_quirk(struct usb_device *dev, unsigned int id)
get_alias_quirk(struct usb_interface *intf, unsigned int id)
{
const struct usb_device_id *p;
struct usb_device_id match_id;
for (p = usb_audio_ids; p->match_flags; p++) {
/* FIXME: this checks only vendor:product pair in the list */
if ((p->match_flags & USB_DEVICE_ID_MATCH_DEVICE) ==
USB_DEVICE_ID_MATCH_DEVICE &&
p->idVendor == USB_ID_VENDOR(id) &&
p->idProduct == USB_ID_PRODUCT(id))
return (const struct snd_usb_audio_quirk *)p->driver_info;
}
if ((p->match_flags & USB_DEVICE_ID_MATCH_DEVICE) !=
USB_DEVICE_ID_MATCH_DEVICE)
continue;
if (p->idVendor != USB_ID_VENDOR(id) ||
p->idProduct != USB_ID_PRODUCT(id))
continue;
match_id = *p;
match_id.match_flags &= ~USB_DEVICE_ID_MATCH_DEVICE;
if (!match_id.match_flags || usb_match_one_id(intf, &match_id))
return (const struct snd_usb_audio_quirk *)
p->driver_info;
}
return NULL;
}
@@ -927,7 +933,7 @@ static int usb_audio_probe(struct usb_interface *intf,
id = USB_ID(le16_to_cpu(dev->descriptor.idVendor),
le16_to_cpu(dev->descriptor.idProduct));
if (get_alias_id(dev, &id))
quirk = get_alias_quirk(dev, id);
quirk = get_alias_quirk(intf, id);
if (quirk && quirk->ifnum >= 0 && ifnum != quirk->ifnum)
return -ENXIO;
if (quirk && quirk->ifnum == QUIRK_NODEV_INTERFACE)