Commit c817cb56 authored Sep 07, 2017 by Lihong Yang Committed by Greg Kroah-Hartman Dec 25, 2017

i40e: use the safe hash table iterator when deleting mac filters




[ Upstream commit 784548c4 ]

This patch replaces hash_for_each function with hash_for_each_safe
when calling  __i40e_del_filter. The hash_for_each_safe function is
the right one to use when iterating over a hash table to safely remove
a hash entry. Otherwise, incorrect values may be read from freed memory.

Detected by CoverityScan, CID 1402048 Read from pointer after free

Signed-off-by: Lihong Yang <lihong.yang@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@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 66efe26b

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -2779,6 +2779,7 @@ int i40e_ndo_set_vf_mac(struct net_device netdev, int vf_id, u8 mac)
		struct i40e_mac_filter *f;
		struct i40e_vf *vf;
		int ret = 0;
		struct hlist_node *h;
		int bkt;

		/* validate the request */
		@@ -2817,7 +2818,7 @@ int i40e_ndo_set_vf_mac(struct net_device netdev, int vf_id, u8 mac)
		/* Delete all the filters for this VSI - we're going to kill it
		* anyway.
		*/
		hash_for_each(vsi->mac_filter_hash, bkt, f, hlist)
		hash_for_each_safe(vsi->mac_filter_hash, bkt, h, f, hlist)
		__i40e_del_filter(vsi, f);

		spin_unlock_bh(&vsi->mac_filter_hash_lock);