Unverified Commit 028b5faf authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12866 fix CVE-2024-50041 

Merge Pull Request from: @ci-robot 
 
PR sync from: Lin Yujun <linyujun809@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/JK7QV7E6QVC73HO47EPQPRLHYQQENKNX/ 
Aleksandr Loktionov (1):
  i40e: Fix macvlan leak by synchronizing access to mac_filter_hash


-- 
2.34.1
 
https://gitee.com/src-openeuler/kernel/issues/IAYRJN 
 
Link:https://gitee.com/openeuler/kernel/pulls/12866

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents e2e32090 7989adb9

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

+1 −0
Original line number Diff line number Diff line
@@ -1744,6 +1744,7 @@ struct i40e_mac_filter *i40e_add_mac_filter(struct i40e_vsi *vsi, 
	struct hlist_node *h;

	int bkt;



	lockdep_assert_held(&vsi->mac_filter_hash_lock);

	if (vsi->info.pvid)

		return i40e_add_filter(vsi, macaddr,

				       le16_to_cpu(vsi->info.pvid));

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

+2 −0
Original line number Diff line number Diff line
@@ -2219,8 +2219,10 @@ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf, u8 *msg) 
		vfres->vsi_res[0].qset_handle

					  = le16_to_cpu(vsi->info.qs_handle[0]);

		if (!(vf->driver_caps & VIRTCHNL_VF_OFFLOAD_USO) && !vf->pf_set_mac) {

			spin_lock_bh(&vsi->mac_filter_hash_lock);

			i40e_del_mac_filter(vsi, vf->default_lan_addr.addr);

			eth_zero_addr(vf->default_lan_addr.addr);

			spin_unlock_bh(&vsi->mac_filter_hash_lock);

		}

		ether_addr_copy(vfres->vsi_res[0].default_mac_addr,

				vf->default_lan_addr.addr);