| Message ID | 20100427092012.GA29093@bicker |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, Apr 27, 2010 at 11:20:12AM +0200, Dan Carpenter wrote: > The calls to usb_free_buffer() dereference rx_urb and tx_urb in the > parameter list but those could be NULL. > > Signed-off-by: Dan Carpenter <error27@gmail.com> Seems good to me (should I ack it or any other kind of singoff?).
From: L. Alberto Giménez <agimenez@sysvalve.es> Date: Tue, 27 Apr 2010 23:00:03 +0200 > On Tue, Apr 27, 2010 at 11:20:12AM +0200, Dan Carpenter wrote: >> The calls to usb_free_buffer() dereference rx_urb and tx_urb in the >> parameter list but those could be NULL. >> >> Signed-off-by: Dan Carpenter <error27@gmail.com> > > Seems good to me (should I ack it or any other kind of singoff?). If you give it an "Acked-by: ..." that would be nice. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Apr 27, 2010 at 11:20:12AM +0200, Dan Carpenter wrote: > The calls to usb_free_buffer() dereference rx_urb and tx_urb in the > parameter list but those could be NULL. > > Signed-off-by: Dan Carpenter <error27@gmail.com> Acked-by: L. Alberto Giménez <agimenez@sysvalve.es>
From: L. Alberto Giménez <agimenez@sysvalve.es> Date: Tue, 27 Apr 2010 23:43:47 +0200 > On Tue, Apr 27, 2010 at 11:20:12AM +0200, Dan Carpenter wrote: >> The calls to usb_free_buffer() dereference rx_urb and tx_urb in the >> parameter list but those could be NULL. >> >> Signed-off-by: Dan Carpenter <error27@gmail.com> > > Acked-by: L. Alberto Giménez <agimenez@sysvalve.es> Applied, thanks everyone. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c index fd10331..418825d 100644 --- a/drivers/net/usb/ipheth.c +++ b/drivers/net/usb/ipheth.c @@ -122,25 +122,25 @@ static int ipheth_alloc_urbs(struct ipheth_device *iphone) tx_urb = usb_alloc_urb(0, GFP_KERNEL); if (tx_urb == NULL) - goto error; + goto error_nomem; rx_urb = usb_alloc_urb(0, GFP_KERNEL); if (rx_urb == NULL) - goto error; + goto free_tx_urb; tx_buf = usb_buffer_alloc(iphone->udev, IPHETH_BUF_SIZE, GFP_KERNEL, &tx_urb->transfer_dma); if (tx_buf == NULL) - goto error; + goto free_rx_urb; rx_buf = usb_buffer_alloc(iphone->udev, IPHETH_BUF_SIZE, GFP_KERNEL, &rx_urb->transfer_dma); if (rx_buf == NULL) - goto error; + goto free_tx_buf; iphone->tx_urb = tx_urb; @@ -149,13 +149,14 @@ static int ipheth_alloc_urbs(struct ipheth_device *iphone) iphone->rx_buf = rx_buf; return 0; -error: - usb_buffer_free(iphone->udev, IPHETH_BUF_SIZE, rx_buf, - rx_urb->transfer_dma); +free_tx_buf: usb_buffer_free(iphone->udev, IPHETH_BUF_SIZE, tx_buf, tx_urb->transfer_dma); +free_rx_urb: usb_free_urb(rx_urb); +free_tx_urb: usb_free_urb(tx_urb); +error_nomem: return -ENOMEM; }
The calls to usb_free_buffer() dereference rx_urb and tx_urb in the parameter list but those could be NULL. Signed-off-by: Dan Carpenter <error27@gmail.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html