From: Yuval Mintz <Yuval.Mintz@qlogic.com>
Date: Mon, 10 Aug 2015 09:49:35 +0000 (+0300)
Subject: bnx2x: Prevent null pointer dereference on SKB release
X-Git-Tag: v4.1.12-92~249^2^2~12
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7acdca04075ce569cce7c67b2e11935c263925f5;p=users%2Fjedix%2Flinux-maple.git

bnx2x: Prevent null pointer dereference on SKB release

Orabug: 22066196

On error flows its possible to free an SKB even if it was not allocated.

Signed-off-by: Yuval Mintz <Yuval.Mintz@qlogic.com>
Signed-off-by: Ariel Elior <Ariel.Elior@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit e1615903eb6b5e599396d4b3d8e3e96f6d432a6e)

Signed-off-by: Dan Duval <dan.duval@oracle.com>
---

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index f34d5f9d08637..9e64b6bfe3d8c 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -264,9 +264,9 @@ static u16 bnx2x_free_tx_pkt(struct bnx2x *bp, struct bnx2x_fp_txdata *txdata,
 	if (likely(skb)) {
 		(*pkts_compl)++;
 		(*bytes_compl) += skb->len;
+		dev_kfree_skb_any(skb);
 	}
 
-	dev_kfree_skb_any(skb);
 	tx_buf->first_bd = 0;
 	tx_buf->skb = NULL;