Commit 391aa852 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Felipe Balbi

usb: gadget: uac2: add some error recovery in afunc_bind()

In case something goes wrong here, don't leak memory / endpoints.
Acked-by: default avatarJassi Brar <jassisinghbrar@gmail.com>
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 64dce914
...@@ -978,15 +978,19 @@ afunc_bind(struct usb_configuration *cfg, struct usb_function *fn) ...@@ -978,15 +978,19 @@ afunc_bind(struct usb_configuration *cfg, struct usb_function *fn)
INTF_SET(agdev->as_in_alt, ret); INTF_SET(agdev->as_in_alt, ret);
agdev->out_ep = usb_ep_autoconfig(gadget, &fs_epout_desc); agdev->out_ep = usb_ep_autoconfig(gadget, &fs_epout_desc);
if (!agdev->out_ep) if (!agdev->out_ep) {
dev_err(&uac2->pdev.dev, dev_err(&uac2->pdev.dev,
"%s:%d Error!\n", __func__, __LINE__); "%s:%d Error!\n", __func__, __LINE__);
goto err;
}
agdev->out_ep->driver_data = agdev; agdev->out_ep->driver_data = agdev;
agdev->in_ep = usb_ep_autoconfig(gadget, &fs_epin_desc); agdev->in_ep = usb_ep_autoconfig(gadget, &fs_epin_desc);
if (!agdev->in_ep) if (!agdev->in_ep) {
dev_err(&uac2->pdev.dev, dev_err(&uac2->pdev.dev,
"%s:%d Error!\n", __func__, __LINE__); "%s:%d Error!\n", __func__, __LINE__);
goto err;
}
agdev->in_ep->driver_data = agdev; agdev->in_ep->driver_data = agdev;
hs_epout_desc.bEndpointAddress = fs_epout_desc.bEndpointAddress; hs_epout_desc.bEndpointAddress = fs_epout_desc.bEndpointAddress;
...@@ -1005,6 +1009,7 @@ afunc_bind(struct usb_configuration *cfg, struct usb_function *fn) ...@@ -1005,6 +1009,7 @@ afunc_bind(struct usb_configuration *cfg, struct usb_function *fn)
prm->max_psize = 0; prm->max_psize = 0;
dev_err(&uac2->pdev.dev, dev_err(&uac2->pdev.dev,
"%s:%d Error!\n", __func__, __LINE__); "%s:%d Error!\n", __func__, __LINE__);
goto err;
} }
prm = &agdev->uac2.p_prm; prm = &agdev->uac2.p_prm;
...@@ -1014,9 +1019,23 @@ afunc_bind(struct usb_configuration *cfg, struct usb_function *fn) ...@@ -1014,9 +1019,23 @@ afunc_bind(struct usb_configuration *cfg, struct usb_function *fn)
prm->max_psize = 0; prm->max_psize = 0;
dev_err(&uac2->pdev.dev, dev_err(&uac2->pdev.dev,
"%s:%d Error!\n", __func__, __LINE__); "%s:%d Error!\n", __func__, __LINE__);
goto err;
} }
return alsa_uac2_init(agdev); ret = alsa_uac2_init(agdev);
if (ret)
goto err;
return 0;
err:
kfree(agdev->uac2.p_prm.rbuf);
kfree(agdev->uac2.c_prm.rbuf);
usb_free_descriptors(fn->hs_descriptors);
usb_free_descriptors(fn->descriptors);
if (agdev->in_ep)
agdev->in_ep->driver_data = NULL;
if (agdev->out_ep)
agdev->out_ep->driver_data = NULL;
return -EINVAL;
} }
static void static void
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment