ixgbe: fix use of uninitialized padding
Subsystems (2)
PATCH 1/2 ixgbe: fix use of uninitialized padding
This patch is resolving Coverity hits where padding in a structure could be used uninitialized.
- Initialize fwd_cmd.pad/2 before ixgbe_calculate_checksum()
- Initialize buffer.pad2/3 before ixgbe_hic_unlocked()
--- drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 4 ++-- drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_common.c +2 -2
@@ -3800,10 +3800,10 @@ s32 ixgbe_set_fw_drv_ver_generic(struct ixgbe_hw *hw, u8 maj, u8 min, fw_cmd.ver_build = build; fw_cmd.ver_sub = sub; fw_cmd.hdr.checksum =0 ; - fw_cmd.hdr.checksum =ixgbe_calculate_checksum ((u8 *)&fw_cmd, - (FW_CEM_HDR_LEN + fw_cmd.hdr.buf_len)); fw_cmd.pad =0 ; fw_cmd.pad2 =0 ; + fw_cmd.hdr.checksum =ixgbe_calculate_checksum ((u8 *)&fw_cmd, + (FW_CEM_HDR_LEN + fw_cmd.hdr.buf_len));for (i =0 ; i <=FW_CEM_MAX_RETRIES ; i++) { ret_val = ixgbe_host_interface_command(hw, &fw_cmd,
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c +2 -0
@@ -1000,6 +1000,8 @@ static s32 ixgbe_read_ee_hostif_buffer_X550(struct ixgbe_hw *hw,/* convert offset from words to bytes */ buffer.address =cpu_to_be32 ((offset + current_word) *2 ); buffer.length =cpu_to_be16 (words_to_read *2 ); + buffer.pad2 =0 ; + buffer.pad3 =0 ; status =ixgbe_hic_unlocked (hw, (u32 *)&buffer,sizeof (buffer),IXGBE_HI_COMMAND_TIMEOUT );
PATCH 2/2 ixgbe: fix the FWSM.PT check in ixgbe_mng_present()
Bits other than FWSM.PT can be set in IXGBE_SWFW_MODE_MASK making the previous check invalid.
Change the check for MNG present to be only based on FWSM.PT bit.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_common.c +2 -2
@@ -4100,8 +4100,8 @@ bool ixgbe_mng_present(struct ixgbe_hw *hw)return false; fwsm =IXGBE_READ_REG (hw,IXGBE_FWSM (hw)); - fwsm &=IXGBE_FWSM_MODE_MASK ; -return fwsm ==IXGBE_FWSM_FW_MODE_PT ; + +return !!(fwsm &IXGBE_FWSM_FW_MODE_PT ); }/**
Bowers
PATCH 2/2 ixgbe: fix the FWSM.PT check in ixgbe_mng_present()
Quoted 11 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Emil Tantilov
Sent: Monday, September 11, 2017 2:22 PM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH 2/2] ixgbe: fix the FWSM.PT check inixgbe_mng_present()Bits other than FWSM.PT can be set in
IXGBE_SWFW_MODE_MASKmaking the previous check invalid.
Quoted 6 lines
Change the check for MNG present to be only based on FWSM.PT bit.
Signed-off-by Emil Tantilov <[email protected]>--- drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Bowers
PATCH 1/2 ixgbe: fix use of uninitialized padding
In reply to Emil TantilovQuoted 12 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Emil Tantilov
Sent: Monday, September 11, 2017 2:22 PM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH 1/2] ixgbe: fix use of uninitialized paddingThis patch is resolving Coverity hits where padding in a structure could be used uninitialized.
- Initialize fwd_cmd.pad/2 before
ixgbe_calculate_checksum()
Quoted 7 lines
- Initialize buffer.pad2/3 before
ixgbe_hic_unlocked()Signed-off-by Emil Tantilov <[email protected]>--- drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 4 ++-- drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-)