Commit 91f9181c authored by Michal Schmidt's avatar Michal Schmidt Committed by Tony Nguyen
Browse files

ice: fix theoretical out-of-bounds access in ethtool link modes 



To map phy types reported by the hardware to ethtool link mode bits,
ice uses two lookup tables (phy_type_low_lkup, phy_type_high_lkup).
The "low" table has 64 elements to cover every possible bit the hardware
may report, but the "high" table has only 13. If the hardware reports a
higher bit in phy_types_high, the driver would access memory beyond the
lookup table's end.

Instead of iterating through all 64 bits of phy_types_{low,high}, use
the sizes of the respective lookup tables.

Fixes: 9136e1f1 ("ice: refactor PHY type to ethtool link mode")
Signed-off-by: default avatarMichal Schmidt <mschmidt@redhat.com>
Reviewed-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 2513974c

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

+2 −2
Original line number Diff line number Diff line
@@ -1850,14 +1850,14 @@ ice_phy_type_to_ethtool(struct net_device *netdev, 
	linkmode_zero(ks->link_modes.supported);

	linkmode_zero(ks->link_modes.advertising);



	for (i = 0; i < BITS_PER_TYPE(u64); i++) {

	for (i = 0; i < ARRAY_SIZE(phy_type_low_lkup); i++) {

		if (phy_types_low & BIT_ULL(i))

			ice_linkmode_set_bit(&phy_type_low_lkup[i], ks,

					     req_speeds, advert_phy_type_lo,

					     i);

	}



	for (i = 0; i < BITS_PER_TYPE(u64); i++) {

	for (i = 0; i < ARRAY_SIZE(phy_type_high_lkup); i++) {

		if (phy_types_high & BIT_ULL(i))

			ice_linkmode_set_bit(&phy_type_high_lkup[i], ks,

					     req_speeds, advert_phy_type_hi,