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

Commit 910c9c0f authored by Tony Nguyen's avatar Tony Nguyen Committed by Jeff Kirsher
Browse files

ixgbe: Add bounds check for x540 LED functions 



This is an extension of commit 003287e0 ("ixgbevf: Correct parameter
sent to LED function"); add bounds checking to x540 functions to ensure the
index is valid.

Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 2bf1a87b

drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c

+7 −2
Original line number Diff line number Diff line
@@ -780,8 +780,10 @@ s32 ixgbe_blink_led_start_X540(struct ixgbe_hw *hw, u32 index) 
	ixgbe_link_speed speed;

	bool link_up;



	/*

	 * Link should be up in order for the blink bit in the LED control

	if (index > 3)

		return IXGBE_ERR_PARAM;



	/* Link should be up in order for the blink bit in the LED control

	 * register to work. Force link and speed in the MAC if link is down.

	 * This will be reversed when we stop the blinking.

	 */
@@ -814,6 +816,9 @@ s32 ixgbe_blink_led_stop_X540(struct ixgbe_hw *hw, u32 index) 
	u32 macc_reg;

	u32 ledctl_reg;



	if (index > 3)

		return IXGBE_ERR_PARAM;



	/* Restore the LED to its default value. */

	ledctl_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);

	ledctl_reg &= ~IXGBE_LED_MODE_MASK(index);