Skip to content

Commit 41e63c2

Browse files
Binary-Eaterkuba-moo
authored andcommitted
net/mlx5e: Check return value of snprintf writing to fw_version buffer
Treat the operation as an error case when the return value is equivalent to the size of the name buffer. Failed to write null terminator to the name buffer, making the string malformed and should not be used. Provide a string with only the firmware version when forming the string with the board id fails. Without check, will trigger -Wformat-truncation with W=1. drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c: In function 'mlx5e_ethtool_get_drvinfo': drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c:49:31: warning: '%.16s' directive output may be truncated writing up to 16 bytes into a region of size between 13 and 22 [-Wformat-truncation=] 49 | "%d.%d.%04d (%.16s)", | ^~~~~ drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c:48:9: note: 'snprintf' output between 12 and 37 bytes into a destination of size 32 48 | snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version), | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 49 | "%d.%d.%04d (%.16s)", | ~~~~~~~~~~~~~~~~~~~~~ 50 | fw_rev_maj(mdev), fw_rev_min(mdev), fw_rev_sub(mdev), | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 51 | mdev->board_id); | ~~~~~~~~~~~~~~~ Fixes: 84e11ed ("net/mlx5e: Show board id in ethtool driver information") Link: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=6d4ab2e97dcfbcd748ae71761a9d8e5e41cc732c Signed-off-by: Rahul Rameshbabu <[email protected]> Reviewed-by: Dragos Tatulea <[email protected]> Signed-off-by: Saeed Mahameed <[email protected]> Signed-off-by: Jakub Kicinski <[email protected]>
1 parent dce9414 commit 41e63c2

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,17 @@ void mlx5e_ethtool_get_drvinfo(struct mlx5e_priv *priv,
4343
struct ethtool_drvinfo *drvinfo)
4444
{
4545
struct mlx5_core_dev *mdev = priv->mdev;
46+
int count;
4647

4748
strscpy(drvinfo->driver, KBUILD_MODNAME, sizeof(drvinfo->driver));
48-
snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),
49-
"%d.%d.%04d (%.16s)",
50-
fw_rev_maj(mdev), fw_rev_min(mdev), fw_rev_sub(mdev),
51-
mdev->board_id);
49+
count = snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),
50+
"%d.%d.%04d (%.16s)", fw_rev_maj(mdev),
51+
fw_rev_min(mdev), fw_rev_sub(mdev), mdev->board_id);
52+
if (count == sizeof(drvinfo->fw_version))
53+
snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),
54+
"%d.%d.%04d", fw_rev_maj(mdev),
55+
fw_rev_min(mdev), fw_rev_sub(mdev));
56+
5257
strscpy(drvinfo->bus_info, dev_name(mdev->device),
5358
sizeof(drvinfo->bus_info));
5459
}

0 commit comments

Comments
 (0)