linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jon Mason <jon.mason@intel.com>
To: linux-kernel@vger.kernel.org
Subject: [PATCH 2/9] ntb_netdev: Fix skb free issue in open
Date: Mon,  7 Apr 2014 17:52:47 -0700	[thread overview]
Message-ID: <1396918374-5196-3-git-send-email-jon.mason@intel.com> (raw)
In-Reply-To: <1396918374-5196-1-git-send-email-jon.mason@intel.com>

In ntb_netdev_open, when ntb_transport_rx_enqueue fails the skb that was
attempting to be enqueued is not freed.  Free this skb on the
ntb_transport_rx_enqueue error.

Signed-off-by: Jon Mason <jon.mason@intel.com>
---
 drivers/net/ntb_netdev.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ntb_netdev.c b/drivers/net/ntb_netdev.c
index 8298880..8e6752f 100644
--- a/drivers/net/ntb_netdev.c
+++ b/drivers/net/ntb_netdev.c
@@ -182,8 +182,10 @@ static int ntb_netdev_open(struct net_device *ndev)
 
 		rc = ntb_transport_rx_enqueue(dev->qp, skb, skb->data,
 					      ndev->mtu + ETH_HLEN);
-		if (rc == -EINVAL)
+		if (rc == -EINVAL) {
+			dev_kfree_skb(skb);
 			goto err;
+		}
 	}
 
 	netif_carrier_off(ndev);
-- 
1.8.3.2


  parent reply	other threads:[~2014-04-08  0:55 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-08  0:52 [PATCH 0/9] NTB Update Jon Mason
2014-04-08  0:52 ` [PATCH 1/9] ntb_netdev: Fix list_for_each_entry exit issue Jon Mason
2014-04-08  0:52 ` Jon Mason [this message]
2014-04-08  0:52 ` [PATCH 3/9] NTB: Fix typo in setting one translation register Jon Mason
2014-04-08  0:52 ` [PATCH 4/9] ntb: Fix leakage of ntb_device::msix_entries[] array Jon Mason
2014-04-08  0:52 ` [PATCH 5/9] NTB: client event cleanup Jon Mason
2014-04-08  0:52 ` [PATCH 6/9] NTB: Code Style Clean-up Jon Mason
2014-04-08  0:52 ` [PATCH 7/9] ntb: Use pci_msix_vec_count() to obtain number of MSI-Xs Jon Mason
2014-04-08  0:52 ` [PATCH 8/9] ntb: Split ntb_setup_msix() into separate BWD/SNB routines Jon Mason
2014-04-08  0:52 ` [PATCH 9/9] ntb: Use pci_enable_msix_range() instead of pci_enable_msix() Jon Mason

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1396918374-5196-3-git-send-email-jon.mason@intel.com \
    --to=jon.mason@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).