From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 1EA421B117 for ; Wed, 21 Nov 2018 17:06:07 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7D5D330833A5; Wed, 21 Nov 2018 16:06:06 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7B9C25F7D9; Wed, 21 Nov 2018 16:06:05 +0000 (UTC) From: Kevin Traynor To: Mark Spender Cc: Andrew Rybchenko , dpdk stable Date: Wed, 21 Nov 2018 16:04:04 +0000 Message-Id: <20181121160440.9014-14-ktraynor@redhat.com> In-Reply-To: <20181121160440.9014-1-ktraynor@redhat.com> References: <20181121160440.9014-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Wed, 21 Nov 2018 16:06:06 +0000 (UTC) Subject: [dpdk-stable] patch 'net/sfc/base: prevent access to the NIC config before probe' has been queued to stable release 18.08.1 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: Wed, 21 Nov 2018 16:06:07 -0000 Hi, FYI, your patch has been queued to stable release 18.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/26/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. Kevin Traynor --- >>From 52fc777ba25ee3250f1ca646bb794a702f296ae4 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 c364bffba..3253b441b 100644 --- a/drivers/net/sfc/base/efx_nic.c +++ b/drivers/net/sfc/base/efx_nic.c @@ -588,4 +588,5 @@ efx_nic_cfg_get( { EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC); + EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_PROBE); return (&(enp->en_nic_cfg)); -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-21 15:59:13.986305249 +0000 +++ 0014-net-sfc-base-prevent-access-to-the-NIC-config-before.patch 2018-11-21 15:59:13.000000000 +0000 @@ -1,12 +1,13 @@ -From f78fb0a8e1c78cc3ffcdd0a6b72f6aa200e980ee Mon Sep 17 00:00:00 2001 +From 52fc777ba25ee3250f1ca646bb794a702f296ae4 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 c364bffba..3253b441b 100644 --- a/drivers/net/sfc/base/efx_nic.c +++ b/drivers/net/sfc/base/efx_nic.c -@@ -596,4 +596,5 @@ efx_nic_cfg_get( +@@ -588,4 +588,5 @@ efx_nic_cfg_get( { EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC); + EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_PROBE);