Commit ef963ae4 authored by Colin Ian King's avatar Colin Ian King Committed by Tony Nguyen
Browse files

ice: Fix potential infinite loop when using u8 loop counter 



A for-loop is using a u8 loop counter that is being compared to
a u32 cmp_dcbcfg->numapp to check for the end of the loop. If
cmp_dcbcfg->numapp is larger than 255 then the counter j will wrap
around to zero and hence an infinite loop occurs. Fix this by making
counter j the same type as cmp_dcbcfg->numapp.

Addresses-Coverity: ("Infinite loop")
Fixes: aeac8ce8 ("ice: Recognize 860 as iSCSI port in CEE mode")
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Tested-by: default avatarTony Brelinski <tonyx.brelinski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent debb9df3

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

+2 −2
Original line number Diff line number Diff line
@@ -747,8 +747,8 @@ ice_cee_to_dcb_cfg(struct ice_aqc_get_cee_dcb_cfg_resp *cee_cfg, 
		   struct ice_port_info *pi)

{

	u32 status, tlv_status = le32_to_cpu(cee_cfg->tlv_status);

	u32 ice_aqc_cee_status_mask, ice_aqc_cee_status_shift;

	u8 i, j, err, sync, oper, app_index, ice_app_sel_type;

	u32 ice_aqc_cee_status_mask, ice_aqc_cee_status_shift, j;

	u8 i, err, sync, oper, app_index, ice_app_sel_type;

	u16 app_prio = le16_to_cpu(cee_cfg->oper_app_prio);

	u16 ice_aqc_cee_app_mask, ice_aqc_cee_app_shift;

	struct ice_dcbx_cfg *cmp_dcbcfg, *dcbcfg;