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

Commit 33a44c28 authored by Matthew Vick's avatar Matthew Vick Committed by Jeff Kirsher
Browse files

fm10k: Validate VLAN ID in fm10k_update_xc_addr_pf 



Currently, fm10k_update_xc_addr_pf has an issue where it does not
properly drop the upper-most four bits of the VLAN ID due to type
promotion. Resolve the issue not by masking off the bits, but by
throwing an error if the VLAN ID is out-of-bounds.

Reported-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: default avatarMatthew Vick <matthew.vick@intel.com>
Tested-by: default avatarKrishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 2ca292d9

drivers/net/ethernet/intel/fm10k/fm10k_pf.c

+2 −5
Original line number Diff line number Diff line
@@ -330,13 +330,10 @@ static s32 fm10k_update_xc_addr_pf(struct fm10k_hw *hw, u16 glort, 
	struct fm10k_mac_update mac_update;

	u32 msg[5];



	/* if glort is not valid return error */

	if (!fm10k_glort_valid_pf(hw, glort))

	/* if glort or vlan are not valid return error */

	if (!fm10k_glort_valid_pf(hw, glort) || vid >= FM10K_VLAN_TABLE_VID_MAX)

		return FM10K_ERR_PARAM;



	/* drop upper 4 bits of VLAN ID */

	vid = (vid << 4) >> 4;



	/* record fields */

	mac_update.mac_lower = cpu_to_le32(((u32)mac[2] << 24) |

						 ((u32)mac[3] << 16) |