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

Commit c44048de authored by Chris Ball's avatar Chris Ball
Browse files

mmc: vub300: fix null dereferences in error handling 



Reported-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent c11760c6

drivers/mmc/host/vub300.c

+4 −7
Original line number Diff line number Diff line
@@ -2096,7 +2096,7 @@ static struct mmc_host_ops vub300_mmc_ops = { 
static int vub300_probe(struct usb_interface *interface,

			const struct usb_device_id *id)

{				/* NOT irq */

	struct vub300_mmc_host *vub300 = NULL;

	struct vub300_mmc_host *vub300;

	struct usb_host_interface *iface_desc;

	struct usb_device *udev = usb_get_dev(interface_to_usbdev(interface));

	int i;
@@ -2118,23 +2118,20 @@ static int vub300_probe(struct usb_interface *interface, 
	command_out_urb = usb_alloc_urb(0, GFP_KERNEL);

	if (!command_out_urb) {

		retval = -ENOMEM;

		dev_err(&vub300->udev->dev,

			"not enough memory for the command_out_urb\n");

		dev_err(&udev->dev, "not enough memory for command_out_urb\n");

		goto error0;

	}

	command_res_urb = usb_alloc_urb(0, GFP_KERNEL);

	if (!command_res_urb) {

		retval = -ENOMEM;

		dev_err(&vub300->udev->dev,

			"not enough memory for the command_res_urb\n");

		dev_err(&udev->dev, "not enough memory for command_res_urb\n");

		goto error1;

	}

	/* this also allocates memory for our VUB300 mmc host device */

	mmc = mmc_alloc_host(sizeof(struct vub300_mmc_host), &udev->dev);

	if (!mmc) {

		retval = -ENOMEM;

		dev_err(&vub300->udev->dev,

			"not enough memory for the mmc_host\n");

		dev_err(&udev->dev, "not enough memory for the mmc_host\n");

		goto error4;

	}

	/* MMC core transfer sizes tunable parameters */