From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B6318A04F0 for ; Thu, 19 Dec 2019 15:41:54 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 98CB71C025; Thu, 19 Dec 2019 15:41:54 +0100 (CET) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 9EC861BDFD for ; Thu, 19 Dec 2019 15:41:53 +0100 (CET) Received: by mail-wr1-f66.google.com with SMTP id c14so6222987wrn.7 for ; Thu, 19 Dec 2019 06:41:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jsb29b7XZc7176XPrZA0jNlYj/cBecSkldA9ElYZvuM=; b=L/qQK/4nQZE6DcfWTtomCsDZru4SjGs25JbQ/cbB8Npbb/Xh9XAHaLz5nO+LxinqKs ZgZhFUlsxZru4UnElZRCisX3FzMAduihxJkv+hdLxJN1EWEjHzo4uFFC0GaudgozG+9b BoVxzdxTmj2z8M/4XLXrphM/k02aOycmsq20QLMn0kmPzFDeeO2rWOOgdLjFRn/PeLoS HwNyxz1r8Z1HljXmH/wZCfqS/5YAgL7STtyU9r3jRAmJ7H6N1FD0qFmynce5zJrqcw2r CEHTnTl02+RsY+/9BbUzELrebyqJE2ImiUO7OBGdGspR/k2yys0UYxqnfIJs5JaaJNGr btXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jsb29b7XZc7176XPrZA0jNlYj/cBecSkldA9ElYZvuM=; b=TeqeTh26PAGnAMY7xpmZ1HasnZW4mwCM35F9+dQGcyNa5xZ+CEN8iEoS3U8+F+lbDy x2+DkfoZ3aGhjlU7u1D1XobCOMH631kU6NRcK/rCskw/eKHi+JPDgBaBi5Xh3ArJV6Oq MgEBBidJXIt0pV3pXwd/jmNmB8Mde/DHARGCvyMf8eJ5Z+eRW5p9t5KUzwcoGhXdVdgs Bg1PAwJnnZj7vSGkPqCX3n9lfMF8HmykA3kGfjmZrUEaE7j753zVokvjzWfAbbFEg08D B1UaZYIXyy8TqaidZj2RGDA596l2ElCEBUvlXwYZw+5dLXioQ+TvYlV/VybXya28dZZc kFgg== X-Gm-Message-State: APjAAAVuZbWjvwOz3oVrlv1q1GJf2V359tbDGwKoUWja1/dzRaJ64wwS DAt7aAx7jb5ibvBmp6MyjCdPZ3oXW14= X-Google-Smtp-Source: APXvYqxb0IPWZNpemql637CqSABoua8FD8IcNq8CVp9rIJbiqOidjUEZe33HQ/LwRWqIeQJj4CxC/g== X-Received: by 2002:adf:ebc3:: with SMTP id v3mr9754602wrn.280.1576766513387; Thu, 19 Dec 2019 06:41:53 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id q6sm7001665wrx.72.2019.12.19.06.41.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:41:52 -0800 (PST) From: luca.boccassi@gmail.com To: Ajit Khaparde Cc: Andy Gospodarek , dpdk stable Date: Thu, 19 Dec 2019 14:34:33 +0000 Message-Id: <20191219143447.21506-126-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191219143447.21506-1-luca.boccassi@gmail.com> References: <20191219143447.21506-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: fix crash in xstats get' has been queued to LTS release 17.11.10 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 17.11.10 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/21/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. Thanks. Luca Boccassi --- >From a3bb3ab471da859ee6fe3cb83f846c1665dc4142 Mon Sep 17 00:00:00 2001 From: Ajit Khaparde 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 Reviewed-by: Andy Gospodarek --- 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 02e8e6ecbd..287624c5d2 100644 --- a/drivers/net/bnxt/bnxt_stats.c +++ b/drivers/net/bnxt/bnxt_stats.c @@ -316,6 +316,9 @@ int bnxt_dev_xstats_get_op(struct rte_eth_dev *eth_dev, return 0; } + if (xstats == NULL) + return 0; + bnxt_hwrm_port_qstats(bp); bnxt_hwrm_func_qstats_tx_drop(bp, 0xffff, &tx_drop_pkts); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-12-19 14:32:31.345816146 +0000 +++ 0126-net-bnxt-fix-crash-in-xstats-get.patch 2019-12-19 14:32:26.329302267 +0000 @@ -1,13 +1,14 @@ -From 063e59ddd28e3a147107366ddba9fb8baeeebc31 Mon Sep 17 00:00:00 2001 +From a3bb3ab471da859ee6fe3cb83f846c1665dc4142 Mon Sep 17 00:00:00 2001 From: Ajit Khaparde 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") -Cc: stable@dpdk.org Signed-off-by: Ajit Khaparde Reviewed-by: Andy Gospodarek @@ -16,19 +17,19 @@ 1 file changed, 3 insertions(+) diff --git a/drivers/net/bnxt/bnxt_stats.c b/drivers/net/bnxt/bnxt_stats.c -index 40b496ac00..14d355fd08 100644 +index 02e8e6ecbd..287624c5d2 100644 --- a/drivers/net/bnxt/bnxt_stats.c +++ b/drivers/net/bnxt/bnxt_stats.c -@@ -468,6 +468,9 @@ int bnxt_dev_xstats_get_op(struct rte_eth_dev *eth_dev, - if (rc) - return rc; +@@ -316,6 +316,9 @@ int bnxt_dev_xstats_get_op(struct rte_eth_dev *eth_dev, + return 0; + } + if (xstats == NULL) + return 0; + - memset(xstats, 0, sizeof(*xstats)); - bnxt_hwrm_port_qstats(bp); + bnxt_hwrm_func_qstats_tx_drop(bp, 0xffff, &tx_drop_pkts); + -- 2.20.1