Skip to content

Commit c56d055

Browse files
KunWuChananguy11
authored andcommitted
igb: Fix string truncation warnings in igb_set_fw_version
Commit 1978d3e ("intel: fix string truncation warnings") fixes '-Wformat-truncation=' warnings in igb_main.c by using kasprintf. drivers/net/ethernet/intel/igb/igb_main.c:3092:53: warning:‘%d’ directive output may be truncated writing between 1 and 5 bytes into a region of size between 1 and 13 [-Wformat-truncation=] 3092 | "%d.%d, 0x%08x, %d.%d.%d", | ^~ drivers/net/ethernet/intel/igb/igb_main.c:3092:34: note:directive argument in the range [0, 65535] 3092 | "%d.%d, 0x%08x, %d.%d.%d", | ^~~~~~~~~~~~~~~~~~~~~~~~~ drivers/net/ethernet/intel/igb/igb_main.c:3092:34: note:directive argument in the range [0, 65535] drivers/net/ethernet/intel/igb/igb_main.c:3090:25: note:‘snprintf’ output between 23 and 43 bytes into a destination of size 32 kasprintf() returns a pointer to dynamically allocated memory which can be NULL upon failure. Fix this warning by using a larger space for adapter->fw_version, and then fall back and continue to use snprintf. Fixes: 1978d3e ("intel: fix string truncation warnings") Signed-off-by: Kunwu Chan <chentao@kylinos.cn> Cc: Kunwu Chan <kunwu.chan@hotmail.com> Suggested-by: Jakub Kicinski <kuba@kernel.org> Reviewed-by: Simon Horman <horms@kernel.org> Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel) Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
1 parent 9b23fce commit c56d055

File tree

2 files changed

+19
-18
lines changed

2 files changed

+19
-18
lines changed

drivers/net/ethernet/intel/igb/igb.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ struct igb_adapter {
637637
struct timespec64 period;
638638
} perout[IGB_N_PEROUT];
639639

640-
char fw_version[32];
640+
char fw_version[48];
641641
#ifdef CONFIG_IGB_HWMON
642642
struct hwmon_buff *igb_hwmon_buff;
643643
bool ets;

drivers/net/ethernet/intel/igb/igb_main.c

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3069,42 +3069,43 @@ void igb_set_fw_version(struct igb_adapter *adapter)
30693069
{
30703070
struct e1000_hw *hw = &adapter->hw;
30713071
struct e1000_fw_version fw;
3072-
char *lbuf;
30733072

30743073
igb_get_fw_version(hw, &fw);
30753074

30763075
switch (hw->mac.type) {
30773076
case e1000_i210:
30783077
case e1000_i211:
30793078
if (!(igb_get_flash_presence_i210(hw))) {
3080-
lbuf = kasprintf(GFP_KERNEL, "%2d.%2d-%d",
3081-
fw.invm_major, fw.invm_minor,
3082-
fw.invm_img_type);
3079+
snprintf(adapter->fw_version,
3080+
sizeof(adapter->fw_version),
3081+
"%2d.%2d-%d",
3082+
fw.invm_major, fw.invm_minor,
3083+
fw.invm_img_type);
30833084
break;
30843085
}
30853086
fallthrough;
30863087
default:
30873088
/* if option rom is valid, display its version too */
30883089
if (fw.or_valid) {
3089-
lbuf = kasprintf(GFP_KERNEL, "%d.%d, 0x%08x, %d.%d.%d",
3090-
fw.eep_major, fw.eep_minor,
3091-
fw.etrack_id, fw.or_major, fw.or_build,
3092-
fw.or_patch);
3090+
snprintf(adapter->fw_version,
3091+
sizeof(adapter->fw_version),
3092+
"%d.%d, 0x%08x, %d.%d.%d",
3093+
fw.eep_major, fw.eep_minor, fw.etrack_id,
3094+
fw.or_major, fw.or_build, fw.or_patch);
30933095
/* no option rom */
30943096
} else if (fw.etrack_id != 0X0000) {
3095-
lbuf = kasprintf(GFP_KERNEL, "%d.%d, 0x%08x",
3096-
fw.eep_major, fw.eep_minor,
3097-
fw.etrack_id);
3097+
snprintf(adapter->fw_version,
3098+
sizeof(adapter->fw_version),
3099+
"%d.%d, 0x%08x",
3100+
fw.eep_major, fw.eep_minor, fw.etrack_id);
30983101
} else {
3099-
lbuf = kasprintf(GFP_KERNEL, "%d.%d.%d", fw.eep_major,
3100-
fw.eep_minor, fw.eep_build);
3102+
snprintf(adapter->fw_version,
3103+
sizeof(adapter->fw_version),
3104+
"%d.%d.%d",
3105+
fw.eep_major, fw.eep_minor, fw.eep_build);
31013106
}
31023107
break;
31033108
}
3104-
3105-
/* the truncate happens here if it doesn't fit */
3106-
strscpy(adapter->fw_version, lbuf, sizeof(adapter->fw_version));
3107-
kfree(lbuf);
31083109
}
31093110

31103111
/**

0 commit comments

Comments
 (0)