From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id B848F1B518 for ; Fri, 30 Nov 2018 00:13:10 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 30 Nov 2018 01:19:00 +0200 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id wATNCW7K032075; Fri, 30 Nov 2018 01:13:05 +0200 From: Yongseok Koh To: Mark Spender Cc: Andrew Rybchenko , dpdk stable Date: Thu, 29 Nov 2018 15:10:14 -0800 Message-Id: <20181129231202.30436-20-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181129231202.30436-1-yskoh@mellanox.com> References: <20181129231202.30436-1-yskoh@mellanox.com> Subject: [dpdk-stable] patch 'net/sfc/base: prevent access to the NIC config before probe' has been queued to LTS release 17.11.5 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: , X-List-Received-Date: Thu, 29 Nov 2018 23:13:11 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.5 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/01/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. Yongseok --- >>From fca876a58f97d8adaac4f22058794cae1996e9b5 Mon Sep 17 00:00:00 2001 From: Mark Spender Date: Mon, 10 Sep 2018 10:33:26 +0100 Subject: [PATCH] net/sfc/base: prevent access to the NIC config before probe [ upstream commit f78fb0a8e1c78cc3ffcdd0a6b72f6aa200e980ee ] NIC config is initialized during NIC probe. Fixes: 19b64c6ac35f ("net/sfc/base: import libefx base") Signed-off-by: Mark Spender Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/base/efx_nic.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/sfc/base/efx_nic.c b/drivers/net/sfc/base/efx_nic.c index adc62341c..a18cb364a 100644 --- a/drivers/net/sfc/base/efx_nic.c +++ b/drivers/net/sfc/base/efx_nic.c @@ -612,6 +612,7 @@ efx_nic_cfg_get( __in efx_nic_t *enp) { EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC); + EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_PROBE); return (&(enp->en_nic_cfg)); } -- 2.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-29 15:01:46.167417701 -0800 +++ 0020-net-sfc-base-prevent-access-to-the-NIC-config-before.patch 2018-11-29 15:01:45.003965000 -0800 @@ -1,12 +1,13 @@ -From f78fb0a8e1c78cc3ffcdd0a6b72f6aa200e980ee Mon Sep 17 00:00:00 2001 +From fca876a58f97d8adaac4f22058794cae1996e9b5 Mon Sep 17 00:00:00 2001 From: Mark Spender Date: Mon, 10 Sep 2018 10:33:26 +0100 Subject: [PATCH] net/sfc/base: prevent access to the NIC config before probe +[ upstream commit f78fb0a8e1c78cc3ffcdd0a6b72f6aa200e980ee ] + NIC config is initialized during NIC probe. Fixes: 19b64c6ac35f ("net/sfc/base: import libefx base") -Cc: stable@dpdk.org Signed-off-by: Mark Spender Signed-off-by: Andrew Rybchenko @@ -15,10 +16,10 @@ 1 file changed, 1 insertion(+) diff --git a/drivers/net/sfc/base/efx_nic.c b/drivers/net/sfc/base/efx_nic.c -index e5cb0105f..cea32b792 100644 +index adc62341c..a18cb364a 100644 --- a/drivers/net/sfc/base/efx_nic.c +++ b/drivers/net/sfc/base/efx_nic.c -@@ -595,6 +595,7 @@ efx_nic_cfg_get( +@@ -612,6 +612,7 @@ efx_nic_cfg_get( __in efx_nic_t *enp) { EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);