[dpdk-stable] patch 'net/bnxt: fix crash in xstats get' has been queued to LTS release 18.11.6

Kevin Traynor ktraynor at redhat.com
Wed Dec 11 22:26:30 CET 2019


Hi,

FYI, your patch has been queued to LTS release 18.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/17/19. 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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/48d9b60c0ad1c25e0c36b7bfc4075580b10bc88d

Thanks.

Kevin.

---
>From 48d9b60c0ad1c25e0c36b7bfc4075580b10bc88d Mon Sep 17 00:00:00 2001
From: Ajit Khaparde <ajit.khaparde at broadcom.com>
Date: Wed, 13 Nov 2019 13:59:43 +0530
Subject: [PATCH] net/bnxt: fix crash in xstats get

[ upstream commit 063e59ddd28e3a147107366ddba9fb8baeeebc31 ]

We would hit a segfault in bnxt_dev_xstats_get_op() if xstats argument
is NULL, Check if the argument is NULL and return appropriately.

Fixes: bfb9c2260be2 ("net/bnxt: support xstats get/reset")

Signed-off-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
Reviewed-by: Andy Gospodarek <gospo at broadcom.com>
---
 drivers/net/bnxt/bnxt_stats.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/bnxt/bnxt_stats.c b/drivers/net/bnxt/bnxt_stats.c
index ad88fbfe7..252a0a6fc 100644
--- a/drivers/net/bnxt/bnxt_stats.c
+++ b/drivers/net/bnxt/bnxt_stats.c
@@ -454,4 +454,7 @@ int bnxt_dev_xstats_get_op(struct rte_eth_dev *eth_dev,
 	unsigned int stat_count;
 
+	if (xstats == NULL)
+		return 0;
+
 	memset(xstats, 0, sizeof(*xstats));
 
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-11 21:24:15.711237173 +0000
+++ 0038-net-bnxt-fix-crash-in-xstats-get.patch	2019-12-11 21:24:12.673651093 +0000
@@ -1 +1 @@
-From 063e59ddd28e3a147107366ddba9fb8baeeebc31 Mon Sep 17 00:00:00 2001
+From 48d9b60c0ad1c25e0c36b7bfc4075580b10bc88d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 063e59ddd28e3a147107366ddba9fb8baeeebc31 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 40b496ac0..14d355fd0 100644
+index ad88fbfe7..252a0a6fc 100644
@@ -22,2 +23,2 @@
-@@ -469,4 +469,7 @@ int bnxt_dev_xstats_get_op(struct rte_eth_dev *eth_dev,
- 		return rc;
+@@ -454,4 +454,7 @@ int bnxt_dev_xstats_get_op(struct rte_eth_dev *eth_dev,
+ 	unsigned int stat_count;



More information about the stable mailing list