Commit 335bc5c5 authored Apr 08, 2025 by Marcin Szycik Committed by Ye Bin Apr 08, 2025

ice: Fix deinitializing VF in error path

stable inclusion
from stable-v6.6.81
commit 3c01102bec9592928e6b155da41cfcd5d25a2066
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IBWVSV
CVE: CVE-2025-21883

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=3c01102bec9592928e6b155da41cfcd5d25a2066



--------------------------------

[ Upstream commit 79990cf5e7aded76d0c092c9f5ed31eb1c75e02c ]

If ice_ena_vfs() fails after calling ice_create_vf_entries(), it frees
all VFs without removing them from snapshot PF-VF mailbox list, leading
to list corruption.

Reproducer:
  devlink dev eswitch set $PF1_PCI mode switchdev
  ip l s $PF1 up
  ip l s $PF1 promisc on
  sleep 1
  echo 1 > /sys/class/net/$PF1/device/sriov_numvfs
  sleep 1
  echo 1 > /sys/class/net/$PF1/device/sriov_numvfs

Trace (minimized):
  list_add corruption. next->prev should be prev (ffff8882e241c6f0), but was 0000000000000000. (next=ffff888455da1330).
  kernel BUG at lib/list_debug.c:29!
  RIP: 0010:__list_add_valid_or_report+0xa6/0x100
   ice_mbx_init_vf_info+0xa7/0x180 [ice]
   ice_initialize_vf_entry+0x1fa/0x250 [ice]
   ice_sriov_configure+0x8d7/0x1520 [ice]
   ? __percpu_ref_switch_mode+0x1b1/0x5d0
   ? __pfx_ice_sriov_configure+0x10/0x10 [ice]

Sometimes a KASAN report can be seen instead with a similar stack trace:
  BUG: KASAN: use-after-free in __list_add_valid_or_report+0xf1/0x100

VFs are added to this list in ice_mbx_init_vf_info(), but only removed
in ice_free_vfs(). Move the removing to ice_free_vf_entries(), which is
also being called in other places where VFs are being removed (including
ice_free_vfs() itself).

Fixes: 8cd8a6b1 ("ice: move VF overflow message count into struct ice_mbx_vf_info")
Reported-by: Sujai Buvaneswaran <sujai.buvaneswaran@intel.com>
Closes: https://lore.kernel.org/intel-wired-lan/PH0PR11MB50138B635F2E5CEB7075325D961F2@PH0PR11MB5013.namprd11.prod.outlook.com


Reviewed-by: Martyna Szapar-Mudlaw <martyna.szapar-mudlaw@linux.intel.com>
Signed-off-by: Marcin Szycik <marcin.szycik@linux.intel.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Tested-by: Sujai Buvaneswaran <sujai.buvaneswaran@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Link: https://patch.msgid.link/20250224190647.3601930-2-anthony.l.nguyen@intel.com


Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Ye Bin <yebin10@huawei.com>

parent 6d23efab

drivers/net/ethernet/intel/ice/ice_sriov.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ static void ice_free_vf_entries(struct ice_pf *pf)

		hash_for_each_safe(vfs->table, bkt, tmp, vf, entry) {
		hash_del_rcu(&vf->entry);
		ice_deinitialize_vf_entry(vf);
		ice_put_vf(vf);
		}
		}
		@@ -194,10 +195,6 @@ void ice_free_vfs(struct ice_pf *pf)
		wr32(hw, GLGEN_VFLRSTAT(reg_idx), BIT(bit_idx));
		}

		/* clear malicious info since the VF is getting released */
		if (!ice_is_feature_supported(pf, ICE_F_MBX_LIMIT))
		list_del(&vf->mbx_info.list_entry);

		mutex_unlock(&vf->cfg_lock);
		}

drivers/net/ethernet/intel/ice/ice_vf_lib.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -1019,6 +1019,14 @@ void ice_initialize_vf_entry(struct ice_vf *vf)
		mutex_init(&vf->cfg_lock);
		}

		void ice_deinitialize_vf_entry(struct ice_vf *vf)
		{
		struct ice_pf *pf = vf->pf;

		if (!ice_is_feature_supported(pf, ICE_F_MBX_LIMIT))
		list_del(&vf->mbx_info.list_entry);
		}

		/**
		* ice_dis_vf_qs - Disable the VF queues
		* @vf: pointer to the VF structure

drivers/net/ethernet/intel/ice/ice_vf_lib_private.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@
		#endif

		void ice_initialize_vf_entry(struct ice_vf *vf);
		void ice_deinitialize_vf_entry(struct ice_vf *vf);
		void ice_dis_vf_qs(struct ice_vf *vf);
		int ice_check_vf_init(struct ice_vf *vf);
		enum virtchnl_status_code ice_err_to_virt_err(int err);