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

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>

5 files changed, 10 insertions, 11 deletions

diff --git a/drivers/usb/gadget/f_ecm.c b/drivers/usb/gadget/f_ecm.c
index 789242749df5..a158740255ce 100644
--- a/drivers/usb/gadget/f_ecm.c
+++ b/drivers/usb/gadget/f_ecm.c
@@ -809,9 +809,9 @@ fail:
         /* we might as well release our claims on endpoints */
         if (ecm->notify)
                 ecm->notify->driver_data = NULL;
-        if (ecm->port.out_ep->desc)
+        if (ecm->port.out_ep)
                 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;
 
         ERROR(cdev, "%s: can't bind, err %d\n", f->name, status);
diff --git a/drivers/usb/gadget/f_eem.c b/drivers/usb/gadget/f_eem.c
index 1a7b2dd7d408..a9cf20522ffa 100644
--- a/drivers/usb/gadget/f_eem.c
+++ b/drivers/usb/gadget/f_eem.c
@@ -319,10 +319,9 @@ fail:
         if (f->hs_descriptors)
                 usb_free_descriptors(f->hs_descriptors);
 
-        /* we might as well release our claims on endpoints */
-        if (eem->port.out_ep->desc)
+        if (eem->port.out_ep)
                 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;
 
         ERROR(cdev, "%s: can't bind, err %d\n", f->name, status);
diff --git a/drivers/usb/gadget/f_ncm.c b/drivers/usb/gadget/f_ncm.c
index 4f0950069a43..424fc3d1cc36 100644
--- a/drivers/usb/gadget/f_ncm.c
+++ b/drivers/usb/gadget/f_ncm.c
@@ -1259,9 +1259,9 @@ fail:
         /* we might as well release our claims on endpoints */
         if (ncm->notify)
                 ncm->notify->driver_data = NULL;
-        if (ncm->port.out_ep->desc)
+        if (ncm->port.out_ep)
                 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;
 
         ERROR(cdev, "%s: can't bind, err %d\n", f->name, status);
diff --git a/drivers/usb/gadget/f_rndis.c b/drivers/usb/gadget/f_rndis.c
index 61f4b13c6cf5..7c27626f0235 100644
--- a/drivers/usb/gadget/f_rndis.c
+++ b/drivers/usb/gadget/f_rndis.c
@@ -803,9 +803,9 @@ fail:
         /* we might as well release our claims on endpoints */
         if (rndis->notify)
                 rndis->notify->driver_data = NULL;
-        if (rndis->port.out_ep->desc)
+        if (rndis->port.out_ep)
                 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;
 
         ERROR(cdev, "%s: can't bind, err %d\n", f->name, status);
diff --git a/drivers/usb/gadget/f_subset.c b/drivers/usb/gadget/f_subset.c
index 4060c0bd9785..deb437c3b53e 100644
--- a/drivers/usb/gadget/f_subset.c
+++ b/drivers/usb/gadget/f_subset.c
@@ -370,9 +370,9 @@ fail:
                 usb_free_descriptors(f->hs_descriptors);
 
         /* 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;
-        if (geth->port.in_ep->desc)
+        if (geth->port.in_ep)
                 geth->port.in_ep->driver_data = NULL;
 
         ERROR(cdev, "%s: can't bind, err %d\n", f->name, status);