Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca6e1d0a authored by Patryk Małek's avatar Patryk Małek Committed by Jeff Kirsher
Browse files

i40e: Fix for adding multiple ethtool filters on the same location 



This patch reorders i40e_add_del_fdir and i40e_update_ethtool_fdir_entry
calls so that we first remove an already existing filter (inside
i40e_update_ethtool_fdir_entry using i40e_add_del_fdir) and then
we add a new one with i40e_add_del_fdir.
After applying this patch, creating multiple identical filters (with
the same location) one after another doesn't revert their behavior
but behaves correctly.

Signed-off-by: default avatarPatryk Małek <patryk.malek@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent f34e308b

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

+6 −6
Original line number Diff line number Diff line
@@ -3939,19 +3939,19 @@ static int i40e_add_fdir_ethtool(struct i40e_vsi *vsi, 
		input->flex_offset = userdef.flex_offset;

	}



	ret = i40e_add_del_fdir(vsi, input, true);

	if (ret)

		goto free_input;



	/* Add the input filter to the fdir_input_list, possibly replacing

	 * a previous filter. Do not free the input structure after adding it

	 * to the list as this would cause a use-after-free bug.

	 */

	i40e_update_ethtool_fdir_entry(vsi, input, fsp->location, NULL);



	ret = i40e_add_del_fdir(vsi, input, true);

	if (ret)

		goto remove_sw_rule;

	return 0;



free_input:

remove_sw_rule:

	hlist_del(&input->fdir_node);

	pf->fdir_pf_active_filters--;

	kfree(input);

	return ret;

}