netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Rasesh Mody <rmody@brocade.com>
To: <davem@davemloft.net>
Cc: <netdev@vger.kernel.org>,
	<adapter_linux_open_src_team@Brocade.COM>,
	Rasesh Mody <rmody@Brocade.COM>
Subject: [net-next 08/12] bna: Add NULL Check Before Dereferencing TCB
Date: Tue, 10 Dec 2013 23:00:47 -0800	[thread overview]
Message-ID: <1386745251-13710-9-git-send-email-rmody@brocade.com> (raw)
In-Reply-To: <1386745251-13710-1-git-send-email-rmody@brocade.com>

Currently we already check to see whether the BNAD_TXQ_TX_STARTED cleared.
But if the tcb structure which contains this flag is also already freed by that
time, we would dereference the NULL pointer. This patch is to check tcb for NULL
pointer, before dereferencing it.

Signed-off-by: Rasesh Mody <rmody@brocade.com>
---
 drivers/net/ethernet/brocade/bna/bnad.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c
index cd29069..27bdd6c 100644
--- a/drivers/net/ethernet/brocade/bna/bnad.c
+++ b/drivers/net/ethernet/brocade/bna/bnad.c
@@ -2947,21 +2947,21 @@ bnad_start_xmit(struct sk_buff *skb, struct net_device *netdev)
 	}
 
 	tcb = bnad->tx_info[0].tcb[txq_id];
-	q_depth = tcb->q_depth;
-	prod = tcb->producer_index;
-
-	unmap_q = tcb->unmap_q;
 
 	/*
 	 * Takes care of the Tx that is scheduled between clearing the flag
 	 * and the netif_tx_stop_all_queues() call.
 	 */
-	if (unlikely(!test_bit(BNAD_TXQ_TX_STARTED, &tcb->flags))) {
+	if (unlikely(!tcb || !test_bit(BNAD_TXQ_TX_STARTED, &tcb->flags))) {
 		dev_kfree_skb(skb);
 		BNAD_UPDATE_CTR(bnad, tx_skb_stopping);
 		return NETDEV_TX_OK;
 	}
 
+	q_depth = tcb->q_depth;
+	prod = tcb->producer_index;
+	unmap_q = tcb->unmap_q;
+
 	vectors = 1 + skb_shinfo(skb)->nr_frags;
 	wis = BNA_TXQ_WI_NEEDED(vectors);	/* 4 vectors per work item */
 
-- 
1.8.2.3

  parent reply	other threads:[~2013-12-11  7:01 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-11  7:00 [net-next 00/12] bna: Update the Driver to v3.2.23.0 Rasesh Mody
2013-12-11  7:00 ` [net-next 01/12] bna: Add software timestamping support Rasesh Mody
2013-12-11  7:00 ` [net-next 02/12] bna: Set Get IOC fw State Rasesh Mody
2013-12-11  7:00 ` [net-next 03/12] bna: Fix Filter Add Del Rasesh Mody
2013-12-11  7:00 ` [net-next 04/12] bna: RX Filter Enhancements Rasesh Mody
2013-12-11  7:00 ` [net-next 05/12] bna: Enable Multi Buffer RX Rasesh Mody
2013-12-11 17:27   ` David Miller
2013-12-12 16:04     ` Rasesh Mody
2013-12-11  7:00 ` [net-next 06/12] bna: RX Processing and Config Changes Rasesh Mody
2013-12-11  7:00 ` [net-next 07/12] bna: CQ Read Fix Rasesh Mody
2013-12-11  7:00 ` Rasesh Mody [this message]
2013-12-11  7:00 ` [net-next 09/12] bna: Handle the TX Setup Failures Rasesh Mody
2013-12-11  7:00 ` [net-next 10/12] bna: Embed SKB Length in TX Vector Rasesh Mody
2013-12-11  7:00 ` [net-next 11/12] bna: Firmware Patch Simplification Rasesh Mody
2013-12-11  7:00 ` [net-next 12/12] bna: Update the Driver Version to 3.2.23.0 Rasesh Mody
  -- strict thread matches above, loose matches on Subject: below --
2013-12-13  1:54 [net-next 00/12] bna: Update the Driver to v3.2.23.0 Rasesh Mody
2013-12-13  1:54 ` [net-next 08/12] bna: Add NULL Check Before Dereferencing TCB Rasesh Mody
2013-12-18  1:07 [net-next 00/12] bna: Update the Driver to v3.2.23.0 Rasesh Mody
2013-12-18  1:07 ` [net-next 08/12] bna: Add NULL Check Before Dereferencing TCB Rasesh Mody

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=1386745251-13710-9-git-send-email-rmody@brocade.com \
    --to=rmody@brocade.com \
    --cc=adapter_linux_open_src_team@Brocade.COM \
    --cc=davem@davemloft.net \
    --cc=netdev@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).