diff mbox

rrunner.c: fix possible memory leak in rr_init_one()

Message ID 513A1E8A.7040408@ll.mit.edu
State Changes Requested, archived
Delegated to: David Miller
Headers show

Commit Message

David Oostdyk March 8, 2013, 5:23 p.m. UTC
In the event that register_netdev() failed, the rrpriv->evt_ring
allocation would have not been freed.

Signed-off-by: David Oostdyk <daveo@ll.mit.edu>
---
  drivers/net/hippi/rrunner.c | 3 +++
  1 file changed, 3 insertions(+)

Comments

David Miller March 8, 2013, 5:32 p.m. UTC | #1
From: David Oostdyk <daveo@ll.mit.edu>
Date: Fri, 8 Mar 2013 12:23:22 -0500

>    out:
> +	if (rrpriv->evt_ring)
> + pci_free_consistent(pdev, EVT_RING_SIZE, rrpriv->evt_ring,
> +				    rrpriv->evt_ring_dma);

Please resend this without the patch being corrupted by your
email client.

Read Documentation/email-clients.txt, and use it to correct this.

Send a test patch to yourself, and only after you can successfully
apply such a patch sent to your yourself should you resubmit your
patch here.

Thanks.
--
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 mbox

Patch

diff --git a/drivers/net/hippi/rrunner.c b/drivers/net/hippi/rrunner.c
index d471963..970595a 100644
--- a/drivers/net/hippi/rrunner.c
+++ b/drivers/net/hippi/rrunner.c
@@ -203,6 +203,9 @@  static int __devinit rr_init_one(struct pci_dev *pdev,
  	return 0;
    out:
+	if (rrpriv->evt_ring)
+		pci_free_consistent(pdev, EVT_RING_SIZE, rrpriv->evt_ring,
+				    rrpriv->evt_ring_dma);
  	if (rrpriv->rx_ring)
  		pci_free_consistent(pdev, RX_TOTAL_SIZE, rrpriv->rx_ring,
  				    rrpriv->rx_ring_dma);
-- 
1.8.1.5