Commit 78f2a9e8 authored Feb 24, 2021 by Michal Maloszewski Committed by Greg Kroah-Hartman Nov 26, 2021

i40e: Fix NULL ptr dereference on VSI filter sync



[ Upstream commit 37d9e304acd903a445df8208b8a13d707902dea6 ]

Remove the reason of null pointer dereference in sync VSI filters.
Added new I40E_VSI_RELEASING flag to signalize deleting and releasing
of VSI resources to sync this thread with sync filters subtask.
Without this patch it is possible to start update the VSI filter list
after VSI is removed, that's causing a kernel oops.

Fixes: 41c445ff ("i40e: main driver core")
Signed-off-by: Grzegorz Szczurek <grzegorzx.szczurek@intel.com>
Signed-off-by: Michal Maloszewski <michal.maloszewski@intel.com>
Reviewed-by: Przemyslaw Patynowski <przemyslawx.patynowski@intel.com>
Reviewed-by: Witold Fijalkowski <witoldx.fijalkowski@intel.com>
Reviewed-by: Jaroslaw Gawin <jaroslawx.gawin@intel.com>
Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
Tested-by: Tony Brelinski <tony.brelinski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 2128303b

drivers/net/ethernet/intel/i40e/i40e.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -163,6 +163,7 @@ enum i40e_vsi_state_t {
		__I40E_VSI_OVERFLOW_PROMISC,
		__I40E_VSI_REINIT_REQUESTED,
		__I40E_VSI_DOWN_REQUESTED,
		__I40E_VSI_RELEASING,
		/* This must be last as it determines the size of the BITMAP */
		__I40E_VSI_STATE_SIZE__,
		};

drivers/net/ethernet/intel/i40e/i40e_main.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -2415,7 +2415,8 @@ static void i40e_sync_filters_subtask(struct i40e_pf *pf)

		for (v = 0; v < pf->num_alloc_vsi; v++) {
		if (pf->vsi[v] &&
		(pf->vsi[v]->flags & I40E_VSI_FLAG_FILTER_CHANGED)) {
		(pf->vsi[v]->flags & I40E_VSI_FLAG_FILTER_CHANGED) &&
		!test_bit(__I40E_VSI_RELEASING, pf->vsi[v]->state)) {
		int ret = i40e_sync_vsi_filters(pf->vsi[v]);

		if (ret) {
		@@ -10098,7 +10099,7 @@ int i40e_vsi_release(struct i40e_vsi *vsi)
		dev_info(&pf->pdev->dev, "Can't remove PF VSI\n");
		return -ENODEV;
		}

		set_bit(__I40E_VSI_RELEASING, vsi->state);
		uplink_seid = vsi->uplink_seid;
		if (vsi->type != I40E_VSI_SRIOV) {
		if (vsi->netdev_registered) {