Skip to content

Commit 989cd9f

Browse files
author
Kalle Valo
committed
wifi: p54: fix GCC format truncation warning with wiphy->fw_version
GCC 13.2 warns: drivers/net/wireless/intersil/p54/fwio.c:128:34: warning: '%s' directive output may be truncated writing up to 39 bytes into a region of size 32 [-Wformat-truncation=] drivers/net/wireless/intersil/p54/fwio.c:128:33: note: directive argument in the range [0, 16777215] drivers/net/wireless/intersil/p54/fwio.c:128:33: note: directive argument in the range [0, 255] drivers/net/wireless/intersil/p54/fwio.c:127:17: note: 'snprintf' output between 7 and 52 bytes into a destination of size 32 The issue here is that wiphy->fw_version is 32 bytes and in theory the string we try to place there can be 39 bytes. wiphy->fw_version is used for providing the firmware version to user space via ethtool, so not really important. fw_version in theory can be 24 bytes but in practise it's shorter, so even if print only 19 bytes via ethtool there should not be any practical difference. I did consider removing fw_var from the string altogether or making the maximum length for fw_version 19 bytes, but chose this approach as it was the least intrusive. Compile tested only. Signed-off-by: Kalle Valo <kvalo@kernel.org> Acked-by: Christian Lamparter <chunkeey@gmail.com> # Tested with Dell 1450 USB Signed-off-by: Kalle Valo <kvalo@kernel.org> Link: https://msgid.link/20231219162516.898205-1-kvalo@kernel.org
1 parent ac63187 commit 989cd9f

File tree

1 file changed

+1
-1
lines changed
  • drivers/net/wireless/intersil/p54

1 file changed

+1
-1
lines changed

drivers/net/wireless/intersil/p54/fwio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ int p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw)
125125
"FW rev %s - Softmac protocol %x.%x\n",
126126
fw_version, priv->fw_var >> 8, priv->fw_var & 0xff);
127127
snprintf(dev->wiphy->fw_version, sizeof(dev->wiphy->fw_version),
128-
"%s - %x.%x", fw_version,
128+
"%.19s - %x.%x", fw_version,
129129
priv->fw_var >> 8, priv->fw_var & 0xff);
130130
}
131131

0 commit comments

Comments
 (0)