ALSA: usb-audio: Fix potential out-of-bound accesses for Extigy devices
PATCH 1/1 ALSA: usb-audio: Fix potential out-of-bound accesses for Extigy devices
A bogus devices can provide a bNumConfigurations value that exceeds the initial value used in usb_get_configuration for allocating dev->config.
This can lead to out-of-bounds accesses later, e.g. in usb_destroy_configuration.
--- sound/usb/quirks.c | 4 ++++ 1 file changed, 4 insertions(+)
sound/usb/quirks.c +4 -0
@@ -555,6 +555,7 @@ int snd_usb_create_quirk(struct snd_usb_audio *chip,static int snd_usb_extigy_boot_quirk (struct usb_device *dev,struct usb_interface *intf) {struct usb_host_config *config = dev->actconfig; +int num_configs;int err; if (le16_to_cpu(get_cfg_desc(config)->wTotalLength) == EXTIGY_FIRMWARE_SIZE_OLD ||
@@ -565,8 +566,11 @@ static int snd_usb_extigy_boot_quirk(struct usb_device *dev, struct usb_interfac 0x10, 0x43, 0x0001, 0x000a, NULL, 0);if (err <0 )dev_dbg (&dev->dev,"error sending boot message: %d\n" , err); + num_configs = dev->descriptor.bNumConfigurations; err =usb_get_descriptor (dev,USB_DT_DEVICE ,0 , &dev->descriptor,sizeof (dev->descriptor)); +if (dev->descriptor.bNumConfigurations > num_configs) + dev->descriptor.bNumConfigurations = num_configs; config = dev->actconfig;if (err <0 )dev_dbg (&dev->dev,"error usb_get_descriptor: %d\n" , err);
Signature · 1 line
2.47.0.338.g60cca15819-goog
Quoted 6 lines · Benoit Sevens
A bogus devices can provide a bNumConfigurations value that exceeds the initial value used in
usb_get_configurationfor allocatingdev->config.This can lead to out-of-bounds accesses later, e.g. in
usb_destroy_configuration.
It'd be more helpful if you can elaborate how it can happen; the code you touched doesn't call much stuff, just send a boot sequence and reset the configuration. Yet your patch tries to overwrite a usb_device field, which isn't really a task for the driver side.
thanks,
Takashi
Quoted 35 lines
Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")Signed-off-by Benoit Sevens <[email protected]>--- sound/usb/quirks.c | 4 ++++ 1 file changed, 4 insertions(+)sound/usb/quirks.c +4
-0@@ -555,6 +555,7 @@ int snd_usb_create_quirk(struct snd_usb_audio *chip,static int snd_usb_extigy_boot_quirk (struct usb_device *dev,struct usb_interface *intf) {struct usb_host_config *config = dev->actconfig; +int num_configs;int err; if (le16_to_cpu(get_cfg_desc(config)->wTotalLength) == EXTIGY_FIRMWARE_SIZE_OLD ||@@ -565,8 +566,11 @@ static int snd_usb_extigy_boot_quirk(struct usb_device *dev, struct usb_interfac 0x10, 0x43, 0x0001, 0x000a, NULL, 0);if (err <0 )dev_dbg (&dev->dev,"error sending boot message: %d\n" , err); + num_configs = dev->descriptor.bNumConfigurations; err =usb_get_descriptor (dev,USB_DT_DEVICE ,0 , &dev->descriptor,sizeof (dev->descriptor)); +if (dev->descriptor.bNumConfigurations > num_configs) + dev->descriptor.bNumConfigurations = num_configs; config = dev->actconfig;if (err <0 )dev_dbg (&dev->dev,"error usb_get_descriptor: %d\n" , err);Signature · 1 line
2.47.0.338.g60cca15819-goog
Quoted 7 lines · Takashi Iwai
Quoted 4 lines · Benoit Sevens
A bogus devices can provide a bNumConfigurations value that exceeds the initial value used in
usb_get_configurationfor allocatingdev->config.
Quoted 7 lines
Quoted 2 lines
This can lead to out-of-bounds accesses later, e.g. in
usb_destroy_configuration.It'd be more helpful if you can elaborate how it can happen; the code you touched doesn't call much stuff, just send a boot sequence and reset the configuration. Yet your patch tries to overwrite a
usb_devicefield, which isn't really a task for the driver side.
I am touching a field of the usb_device->descriptor, which the current code is already doing in usb_get_descriptor().
A malicious device can use the snd_usb_extigy_boot_quirk() quirk to provide a new device descriptor with an increased bNumConfigurations, after dev->config has already been allocated for a smaller bNumConfigurations. This will lead to out of bounds accesses later on, such as freeing out-of-bounds pointers in usb_destroy_configuration.
Actually, I noticed snd_usb_mbox2_boot_quirk and snd_usb_mbox3_boot_quirk can probably be abused in the same way, so I'll propose a new patch that also does a check there.
Unless anyone knows of a better/cleaner way to fix this?
Quoted 25 lines
thanks,
Takashi
Quoted 19 lines
Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")Signed-off-by Benoit Sevens <[email protected]>--- sound/usb/quirks.c | 4 ++++ 1 file changed, 4 insertions(+)sound/usb/quirks.c +1
-0@@ -555,6 +555,7 @@ int snd_usb_create_quirk(struct snd_usb_audio *chip,static int snd_usb_extigy_boot_quirk (struct usb_device *dev,struct usb_interface *intf) {struct usb_host_config *config = dev->actconfig; +int num_configs;int err;
Quoted 16 lines
Quoted 14 lines
sound/usb/quirks.c +3
-1if (le16_to_cpu(get_cfg_desc(config)->wTotalLength) == EXTIGY_FIRMWARE_SIZE_OLD ||@@ -565,8 +566,11 @@ static int snd_usb_extigy_boot_quirk(struct usb_device *dev, struct usb_interfac 0x10, 0x43, 0x0001, 0x000a, NULL, 0);if (err <0 )dev_dbg (&dev->dev,"error sending boot message: %d\n" , err); + num_configs = dev->descriptor.bNumConfigurations; err =usb_get_descriptor (dev,USB_DT_DEVICE ,0 , &dev->descriptor,sizeof (dev->descriptor)); +if (dev->descriptor.bNumConfigurations > num_configs) + dev->descriptor.bNumConfigurations = num_configs; config = dev->actconfig;if (err <0 )dev_dbg (&dev->dev,"error usb_get_descriptor: %d\n" , err); --Quoted 2 lines
2.47.0.338.g60cca15819-goog
Thanks,
Benoit