Skip to content

Commit c1fe23f

Browse files
Dan CarpenterExactExampl
authored andcommitted
UPSTREAM: ALSA: usb-audio: Fix a DMA to stack memory bug
commit f7d306b47a24367302bd4fe846854e07752ffcd9 upstream. The usb_get_descriptor() function does DMA so we're not allowed to use a stack buffer for that. Doing DMA to the stack is not portable all architectures. Move the "new_device_descriptor" from being stored on the stack and allocate it with kmalloc() instead. Bug: 382243530 Fixes: b909df18ce2a ("ALSA: usb-audio: Fix potential out-of-bound accesses for Extigy and Mbox devices") Cc: stable@kernel.org Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Link: https://patch.msgid.link/60e3aa09-039d-46d2-934c-6f123026c2eb@stanley.mountain Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Benoît Sevens <bsevens@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit 4e54dc4bbc602133217de301d9f814f3e6d22eee) Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: I469212aa538584e3d8cc5b0087b68c99acf43f64
1 parent 5156740 commit c1fe23f

1 file changed

Lines changed: 21 additions & 10 deletions

File tree

sound/usb/quirks.c

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ int snd_usb_create_quirk(struct snd_usb_audio *chip,
596596
static int snd_usb_extigy_boot_quirk(struct usb_device *dev, struct usb_interface *intf)
597597
{
598598
struct usb_host_config *config = dev->actconfig;
599-
struct usb_device_descriptor new_device_descriptor;
599+
struct usb_device_descriptor *new_device_descriptor = NULL;
600600
int err;
601601

602602
if (le16_to_cpu(get_cfg_desc(config)->wTotalLength) == EXTIGY_FIRMWARE_SIZE_OLD ||
@@ -607,15 +607,20 @@ static int snd_usb_extigy_boot_quirk(struct usb_device *dev, struct usb_interfac
607607
0x10, 0x43, 0x0001, 0x000a, NULL, 0);
608608
if (err < 0)
609609
dev_dbg(&dev->dev, "error sending boot message: %d\n", err);
610+
611+
new_device_descriptor = kmalloc(sizeof(*new_device_descriptor), GFP_KERNEL);
612+
if (!new_device_descriptor)
613+
return -ENOMEM;
610614
err = usb_get_descriptor(dev, USB_DT_DEVICE, 0,
611-
&new_device_descriptor, sizeof(new_device_descriptor));
615+
new_device_descriptor, sizeof(*new_device_descriptor));
612616
if (err < 0)
613617
dev_dbg(&dev->dev, "error usb_get_descriptor: %d\n", err);
614-
if (new_device_descriptor.bNumConfigurations > dev->descriptor.bNumConfigurations)
618+
if (new_device_descriptor->bNumConfigurations > dev->descriptor.bNumConfigurations)
615619
dev_dbg(&dev->dev, "error too large bNumConfigurations: %d\n",
616-
new_device_descriptor.bNumConfigurations);
620+
new_device_descriptor->bNumConfigurations);
617621
else
618-
memcpy(&dev->descriptor, &new_device_descriptor, sizeof(dev->descriptor));
622+
memcpy(&dev->descriptor, new_device_descriptor, sizeof(dev->descriptor));
623+
kfree(new_device_descriptor);
619624
err = usb_reset_configuration(dev);
620625
if (err < 0)
621626
dev_dbg(&dev->dev, "error usb_reset_configuration: %d\n", err);
@@ -831,7 +836,7 @@ static void mbox2_setup_48_24_magic(struct usb_device *dev)
831836
static int snd_usb_mbox2_boot_quirk(struct usb_device *dev)
832837
{
833838
struct usb_host_config *config = dev->actconfig;
834-
struct usb_device_descriptor new_device_descriptor;
839+
struct usb_device_descriptor *new_device_descriptor = NULL;
835840
int err;
836841
u8 bootresponse[0x12];
837842
int fwsize;
@@ -866,15 +871,21 @@ static int snd_usb_mbox2_boot_quirk(struct usb_device *dev)
866871

867872
dev_dbg(&dev->dev, "device initialised!\n");
868873

874+
new_device_descriptor = kmalloc(sizeof(*new_device_descriptor), GFP_KERNEL);
875+
if (!new_device_descriptor)
876+
return -ENOMEM;
877+
869878
err = usb_get_descriptor(dev, USB_DT_DEVICE, 0,
870-
&new_device_descriptor, sizeof(new_device_descriptor));
879+
new_device_descriptor, sizeof(*new_device_descriptor));
871880
if (err < 0)
872881
dev_dbg(&dev->dev, "error usb_get_descriptor: %d\n", err);
873-
if (new_device_descriptor.bNumConfigurations > dev->descriptor.bNumConfigurations)
882+
if (new_device_descriptor->bNumConfigurations > dev->descriptor.bNumConfigurations)
874883
dev_dbg(&dev->dev, "error too large bNumConfigurations: %d\n",
875-
new_device_descriptor.bNumConfigurations);
884+
new_device_descriptor->bNumConfigurations);
876885
else
877-
memcpy(&dev->descriptor, &new_device_descriptor, sizeof(dev->descriptor));
886+
memcpy(&dev->descriptor, new_device_descriptor, sizeof(dev->descriptor));
887+
888+
kfree(new_device_descriptor);
878889

879890
err = usb_reset_configuration(dev);
880891
if (err < 0)

0 commit comments

Comments
 (0)