Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Sasha Levin <Alexander.Levin@microsoft.com>
To:     "stable@vger.kernel.org" <stable@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
CC:     Jacob Keller <jacob.e.keller@intel.com>,
        Jeff Kirsher <jeffrey.t.kirsher@intel.com>,
        Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL for 4.9 110/293] i40evf: assign num_active_queues
 inside i40evf_alloc_queues
Thread-Topic: [PATCH AUTOSEL for 4.9 110/293] i40evf: assign num_active_queues
 inside i40evf_alloc_queues
Thread-Index: AQHTz5kZet1POMSreE6BRb+oumHUoQ==
Date:   Mon, 9 Apr 2018 00:24:19 +0000
Message-ID: <20180409002239.163177-110-alexander.levin@microsoft.com>
References: <20180409002239.163177-1-alexander.levin@microsoft.com>
In-Reply-To: <20180409002239.163177-1-alexander.levin@microsoft.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: microsoft.com does not designate
 permitted sender hosts)
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: b5baf6ec-ef99-4653-d05c-08d59db0f916
X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:24:19.1594
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0967
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Jacob Keller <jacob.e.keller@intel.com>

[ Upstream commit 65c7006f234c9ede887d468f595f259a5c5cc552 ]

The variable num_active_queues represents the number of active queues we
have for the device. We assign this pretty early in i40evf_init_subtask.

Several code locations are written with loops over the tx_rings and
rx_rings structures, which don't get allocated until
i40evf_alloc_queues, and which get freed by i40evf_free_queues.

These call sites were written under the assumption that tx_rings and
rx_rings would always be allocated at least when num_active_queues is
non-zero.

Lets fix this by moving the assignment into the function where we
allocate queues. We'll use a temporary variable for storage so that we
don't assign the value in the adapter structure until after the rings
have been set up.

Finally, when we free the queues, we'll clear the value to ensure that
we do not loop over the rings memory that no longer exists.

This resolves a possible NULL pointer dereference in
i40evf_get_ethtool_stats which could occur if the VF fails to recover
from a reset, and then a user requests statistics.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
 drivers/net/ethernet/intel/i40evf/i40evf_main.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/=
ethernet/intel/i40evf/i40evf_main.c
index 14372810fc27..34fc948bf550 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -1123,6 +1123,7 @@ static void i40evf_free_queues(struct i40evf_adapter =
*adapter)
 {
 	if (!adapter->vsi_res)
 		return;
+	adapter->num_active_queues =3D 0;
 	kfree(adapter->tx_rings);
 	adapter->tx_rings =3D NULL;
 	kfree(adapter->rx_rings);
@@ -1139,18 +1140,22 @@ static void i40evf_free_queues(struct i40evf_adapte=
r *adapter)
  **/
 static int i40evf_alloc_queues(struct i40evf_adapter *adapter)
 {
-	int i;
+	int i, num_active_queues;
+
+	num_active_queues =3D min_t(int,
+				  adapter->vsi_res->num_queue_pairs,
+				  (int)(num_online_cpus()));
=20
-	adapter->tx_rings =3D kcalloc(adapter->num_active_queues,
+	adapter->tx_rings =3D kcalloc(num_active_queues,
 				    sizeof(struct i40e_ring), GFP_KERNEL);
 	if (!adapter->tx_rings)
 		goto err_out;
-	adapter->rx_rings =3D kcalloc(adapter->num_active_queues,
+	adapter->rx_rings =3D kcalloc(num_active_queues,
 				    sizeof(struct i40e_ring), GFP_KERNEL);
 	if (!adapter->rx_rings)
 		goto err_out;
=20
-	for (i =3D 0; i < adapter->num_active_queues; i++) {
+	for (i =3D 0; i < num_active_queues; i++) {
 		struct i40e_ring *tx_ring;
 		struct i40e_ring *rx_ring;
=20
@@ -1172,6 +1177,8 @@ static int i40evf_alloc_queues(struct i40evf_adapter =
*adapter)
 		rx_ring->rx_itr_setting =3D (I40E_ITR_DYNAMIC | I40E_ITR_RX_DEF);
 	}
=20
+	adapter->num_active_queues =3D num_active_queues;
+
 	return 0;
=20
 err_out:
@@ -2440,9 +2447,6 @@ static void i40evf_init_task(struct work_struct *work=
)
 	adapter->watchdog_timer.data =3D (unsigned long)adapter;
 	mod_timer(&adapter->watchdog_timer, jiffies + 1);
=20
-	adapter->num_active_queues =3D min_t(int,
-					   adapter->vsi_res->num_queue_pairs,
-					   (int)(num_online_cpus()));
 	adapter->tx_desc_count =3D I40EVF_DEFAULT_TXD;
 	adapter->rx_desc_count =3D I40EVF_DEFAULT_RXD;
 	err =3D i40evf_init_interrupt_scheme(adapter);
--=20
2.15.1