[dpdk-stable] patch 'net/bnxt: fix uninitialized pointer access in Tx' has been queued to LTS release 16.11.9

[Luca Boccassi <bluca@debian.org>]

Hi,

FYI, your patch has been queued to LTS release 16.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/17/18. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Luca Boccassi

---
>From 921f95806c08955aaee433f9e7aaa85b6847193d Mon Sep 17 00:00:00 2001
From: Somnath Kotur <somnath.kotur@broadcom.com>
Date: Fri, 28 Sep 2018 18:59:53 -0700
Subject: [PATCH] net/bnxt: fix uninitialized pointer access in Tx

[ upstream commit 63d086a52f0120523f3a33878d3ca0072b2de879 ]

bnxt_start_xmit() was attempting to access an uninitialized ptr - txbd1
which would lead to segmentation fault.
Fix to initialize ptr to NULL and check for the same before access.

Fixes: f10258e39ec2 ("net/bnxt: fix HW Tx checksum offload check")

Signed-off-by: Somnath Kotur <somnath.kotur@broadcom.com>
Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
---
 drivers/net/bnxt/bnxt_txr.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c
index ff24e23238..f1e1616bca 100644
--- a/drivers/net/bnxt/bnxt_txr.c
+++ b/drivers/net/bnxt/bnxt_txr.c
@@ -146,7 +146,7 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
 {
 	struct bnxt_tx_ring_info *txr = txq->tx_ring;
 	struct tx_bd_long *txbd;
-	struct tx_bd_long_hi *txbd1;
+	struct tx_bd_long_hi *txbd1 = NULL;
 	uint32_t vlan_tag_flags, cfa_action;
 	bool long_bd = false;
 	uint16_t last_prod = 0;
@@ -313,7 +313,8 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
 	}
 
 	txbd->flags_type |= TX_BD_LONG_FLAGS_PACKET_END;
-	txbd1->lflags = rte_cpu_to_le_32(txbd1->lflags);
+	if (txbd1)
+		txbd1->lflags = rte_cpu_to_le_32(txbd1->lflags);
 
 	txr->tx_prod = RING_NEXT(txr->tx_ring_struct, txr->tx_prod);
 
-- 
2.19.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-10-15 12:48:34.979601163 +0100
+++ 0014-net-bnxt-fix-uninitialized-pointer-access-in-Tx.patch	2018-10-15 12:48:34.577096017 +0100
@@ -1,14 +1,15 @@
-From 63d086a52f0120523f3a33878d3ca0072b2de879 Mon Sep 17 00:00:00 2001
+From 921f95806c08955aaee433f9e7aaa85b6847193d Mon Sep 17 00:00:00 2001
 From: Somnath Kotur <somnath.kotur@broadcom.com>
 Date: Fri, 28 Sep 2018 18:59:53 -0700
 Subject: [PATCH] net/bnxt: fix uninitialized pointer access in Tx
 
+[ upstream commit 63d086a52f0120523f3a33878d3ca0072b2de879 ]
+
 bnxt_start_xmit() was attempting to access an uninitialized ptr - txbd1
 which would lead to segmentation fault.
 Fix to initialize ptr to NULL and check for the same before access.
 
 Fixes: f10258e39ec2 ("net/bnxt: fix HW Tx checksum offload check")
-Cc: stable@dpdk.org
 
 Signed-off-by: Somnath Kotur <somnath.kotur@broadcom.com>
 Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
@@ -17,10 +18,10 @@
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c
-index 67bb35e06d..39be7bdfad 100644
+index ff24e23238..f1e1616bca 100644
 --- a/drivers/net/bnxt/bnxt_txr.c
 +++ b/drivers/net/bnxt/bnxt_txr.c
-@@ -120,7 +120,7 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
+@@ -146,7 +146,7 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
  {
  	struct bnxt_tx_ring_info *txr = txq->tx_ring;
  	struct tx_bd_long *txbd;
@@ -29,7 +30,7 @@
  	uint32_t vlan_tag_flags, cfa_action;
  	bool long_bd = false;
  	uint16_t last_prod = 0;
-@@ -295,7 +295,8 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
+@@ -313,7 +313,8 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
  	}
  
  	txbd->flags_type |= TX_BD_LONG_FLAGS_PACKET_END;