Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-18 03:06:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

usb: gadget: network: fix bind() error path

Browse Source 
I think this is wrong since 72c973dd ("usb: gadget: add
usb_endpoint_descriptor to struct usb_ep"). If we fail to allocate an ep
or bail out early we shouldn't check for the descriptor which is
assigned at ep_enable() time.

Cc: Tatyana Brokhman <tlinder@codeaurora.org>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Sebastian Andrzej Siewior 2012-10-22 22:15:00 +02:00 committed by Felipe Balbi
parent 391aa852a3
commit e79cc615a9
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/usb/gadget/f_ecm.c
View File

@ -809,9 +809,9 @@ fail:
/* we might as well release our claims on endpoints */ /* we might as well release our claims on endpoints */
if (ecm->notify) if (ecm->notify)
ecm->notify->driver_data = NULL; ecm->notify->driver_data = NULL;
if (ecm->port.out_ep->desc) if (ecm->port.out_ep)
ecm->port.out_ep->driver_data = NULL; ecm->port.out_ep->driver_data = NULL;
if (ecm->port.in_ep->desc) if (ecm->port.in_ep)
ecm->port.in_ep->driver_data = NULL; ecm->port.in_ep->driver_data = NULL;
ERROR(cdev, "%s: can't bind, err %d\n", f->name, status); ERROR(cdev, "%s: can't bind, err %d\n", f->name, status);

5
drivers/usb/gadget/f_eem.c
View File

@ -319,10 +319,9 @@ fail:
if (f->hs_descriptors) if (f->hs_descriptors)
usb_free_descriptors(f->hs_descriptors); usb_free_descriptors(f->hs_descriptors);
/* we might as well release our claims on endpoints */ if (eem->port.out_ep)
if (eem->port.out_ep->desc)
eem->port.out_ep->driver_data = NULL; eem->port.out_ep->driver_data = NULL;
if (eem->port.in_ep->desc) if (eem->port.in_ep)
eem->port.in_ep->driver_data = NULL; eem->port.in_ep->driver_data = NULL;
ERROR(cdev, "%s: can't bind, err %d\n", f->name, status); ERROR(cdev, "%s: can't bind, err %d\n", f->name, status);

4
drivers/usb/gadget/f_ncm.c
View File

@ -1259,9 +1259,9 @@ fail:
/* we might as well release our claims on endpoints */ /* we might as well release our claims on endpoints */
if (ncm->notify) if (ncm->notify)
ncm->notify->driver_data = NULL; ncm->notify->driver_data = NULL;
if (ncm->port.out_ep->desc) if (ncm->port.out_ep)
ncm->port.out_ep->driver_data = NULL; ncm->port.out_ep->driver_data = NULL;
if (ncm->port.in_ep->desc) if (ncm->port.in_ep)
ncm->port.in_ep->driver_data = NULL; ncm->port.in_ep->driver_data = NULL;
ERROR(cdev, "%s: can't bind, err %d\n", f->name, status); ERROR(cdev, "%s: can't bind, err %d\n", f->name, status);

4
drivers/usb/gadget/f_rndis.c
View File

@ -803,9 +803,9 @@ fail:
/* we might as well release our claims on endpoints */ /* we might as well release our claims on endpoints */
if (rndis->notify) if (rndis->notify)
rndis->notify->driver_data = NULL; rndis->notify->driver_data = NULL;
if (rndis->port.out_ep->desc) if (rndis->port.out_ep)
rndis->port.out_ep->driver_data = NULL; rndis->port.out_ep->driver_data = NULL;
if (rndis->port.in_ep->desc) if (rndis->port.in_ep)
rndis->port.in_ep->driver_data = NULL; rndis->port.in_ep->driver_data = NULL;
ERROR(cdev, "%s: can't bind, err %d\n", f->name, status); ERROR(cdev, "%s: can't bind, err %d\n", f->name, status);

4
drivers/usb/gadget/f_subset.c
View File

@ -370,9 +370,9 @@ fail:
usb_free_descriptors(f->hs_descriptors); usb_free_descriptors(f->hs_descriptors);
/* we might as well release our claims on endpoints */ /* we might as well release our claims on endpoints */
if (geth->port.out_ep->desc) if (geth->port.out_ep)
geth->port.out_ep->driver_data = NULL; geth->port.out_ep->driver_data = NULL;
if (geth->port.in_ep->desc) if (geth->port.in_ep)
geth->port.in_ep->driver_data = NULL; geth->port.in_ep->driver_data = NULL;
ERROR(cdev, "%s: can't bind, err %d\n", f->name, status); ERROR(cdev, "%s: can't bind, err %d\n", f->name, status);