mirror of
git://git.yoctoproject.org/linux-yocto.git
synced 2025-10-22 23:13:01 +02:00
ixgbe: fix ixgbe_orom_civd_info struct layout
[ Upstream commit ed913b343dcf9f623e7436fa1a153c89b22d109b ]
The current layout of struct ixgbe_orom_civd_info causes incorrect data
storage due to compiler-inserted padding. This results in issues when
writing OROM data into the structure.
Add the __packed attribute to ensure the structure layout matches the
expected binary format without padding.
Fixes: 70db0788a2
("ixgbe: read the OROM version information")
Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
Signed-off-by: Jedrzej Jagielski <jedrzej.jagielski@intel.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Tested-by: Rinitha S <sx.rinitha@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
6fdfa22260
commit
23786f49e1
|
@ -3123,7 +3123,7 @@ static int ixgbe_get_orom_ver_info(struct ixgbe_hw *hw,
|
|||
if (err)
|
||||
return err;
|
||||
|
||||
combo_ver = le32_to_cpu(civd.combo_ver);
|
||||
combo_ver = get_unaligned_le32(&civd.combo_ver);
|
||||
|
||||
orom->major = (u8)FIELD_GET(IXGBE_OROM_VER_MASK, combo_ver);
|
||||
orom->patch = (u8)FIELD_GET(IXGBE_OROM_VER_PATCH_MASK, combo_ver);
|
||||
|
|
|
@ -1150,7 +1150,7 @@ struct ixgbe_orom_civd_info {
|
|||
__le32 combo_ver; /* Combo Image Version number */
|
||||
u8 combo_name_len; /* Length of the unicode combo image version string, max of 32 */
|
||||
__le16 combo_name[32]; /* Unicode string representing the Combo Image version */
|
||||
};
|
||||
} __packed;
|
||||
|
||||
/* Function specific capabilities */
|
||||
struct ixgbe_hw_func_caps {
|
||||
|
|
Loading…
Reference in New Issue
Block a user