Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bbab59d6 authored by Takashi Iwai's avatar Takashi Iwai Committed by Greg Kroah-Hartman
Browse files

ALSA: caiaq: Fix stray URB at probe error path 



commit 99fee508245825765ff60155fed43f970ff83a8f upstream.

caiaq driver doesn't kill the URB properly at its error path during
the probe, which may lead to a use-after-free error later.  This patch
addresses it.

Reported-by: default avatarJohan Hovold <johan@kernel.org>
Reviewed-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6571ce84

sound/usb/caiaq/device.c

+9 −3
Original line number Diff line number Diff line
@@ -469,10 +469,12 @@ static int init_card(struct snd_usb_caiaqdev *cdev) 


	err = snd_usb_caiaq_send_command(cdev, EP1_CMD_GET_DEVICE_INFO, NULL, 0);

	if (err)

		return err;

		goto err_kill_urb;



	if (!wait_event_timeout(cdev->ep1_wait_queue, cdev->spec_received, HZ))

		return -ENODEV;

	if (!wait_event_timeout(cdev->ep1_wait_queue, cdev->spec_received, HZ)) {

		err = -ENODEV;

		goto err_kill_urb;

	}



	usb_string(usb_dev, usb_dev->descriptor.iManufacturer,

		   cdev->vendor_name, CAIAQ_USB_STR_LEN);
@@ -507,6 +509,10 @@ static int init_card(struct snd_usb_caiaqdev *cdev) 


	setup_card(cdev);

	return 0;



 err_kill_urb:

	usb_kill_urb(&cdev->ep1_in_urb);

	return err;

}



static int snd_probe(struct usb_interface *intf,