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

Commit 328fafb9 authored by Colin Ian King's avatar Colin Ian King Committed by Greg Kroah-Hartman
Browse files

usb: hcd: do not call whc_clean_up on wch_init call failure 



whc_init already calls whc_clean_up if an error occurs during
the initialization, so calling it again if whc_init fails at
the end of wch_probe will cause double free errors.  Fix this
by bailing out on an whc_init failure to a new label that avoids
doing the duplicated whc_clean_up.

Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1507372b

drivers/usb/host/whci/hcd.c

+4 −3
Original line number Diff line number Diff line
@@ -257,14 +257,14 @@ static int whc_probe(struct umc_dev *umc) 


	ret = whc_init(whc);

	if (ret)

		goto error;

		goto error_whc_init;



	wusbhc->dev = dev;

	wusbhc->uwb_rc = uwb_rc_get_by_grandpa(umc->dev.parent);

	if (!wusbhc->uwb_rc) {

		ret = -ENODEV;

		dev_err(dev, "cannot get radio controller\n");

		goto error;

		goto error_uwb_rc;

	}



	if (whc->n_devices > USB_MAXCHILDREN) {
@@ -311,8 +311,9 @@ static int whc_probe(struct umc_dev *umc) 
	wusbhc_destroy(wusbhc);

error_wusbhc_create:

	uwb_rc_put(wusbhc->uwb_rc);

error:

error_uwb_rc:

	whc_clean_up(whc);

error_whc_init:

	usb_put_hcd(usb_hcd);

	return ret;

}