Skip to contentSkip to conversation

net/mlx5: fix build with clang 14

PATCH Superseded Ali Alnubani 5 participants 7 messages May 11, 2022 – Jun 15, 2022 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/mlx5: fix build with clang 14

Use fgets instead of fscanf to resolve the following warning reported by clang 14.0.0 in Fedora 37 (Rawhide):

drivers/net/mlx5/linux/mlx5_ethdev_os.c:1137:52: error:
'fscanf' may overflow; destination buffer in argument 3 has size 16, but the corresponding specifier may require size 17 [-Werror,-Wfortify-source]
ret = fscanf(file, "%" RTE_STR(IF_NAMESIZE) "s", port_name);

Fixes 63d1db710fbc ("net/mlx5: fix unlimited parsing of switch info")
---
 drivers/net/mlx5/linux/mlx5_ethdev_os.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/mlx5/linux/mlx5_ethdev_os.c +3 -3
index 8fe73f1adb..3d28597e7b 100644
@@ -1118,7 +1118,7 @@ mlx5_sysfs_switch_info(unsigned int ifindex, struct mlx5_switch_info *info)
 	bool port_switch_id_set = false;
 	bool device_dir = false;
 	char c;
-	int ret;
+	char *ret;
 
 	if (!if_indextoname(ifindex, ifname)) {
 		rte_errno = errno;
@@ -1134,9 +1134,9 @@ mlx5_sysfs_switch_info(unsigned int ifindex, struct mlx5_switch_info *info)
 
 	file = fopen(phys_port_name, "rb");
 	if (file != NULL) {
-		ret = fscanf(file, "%" RTE_STR(IF_NAMESIZE) "s", port_name);
+		ret = fgets(port_name, IF_NAMESIZE, file);
 		fclose(file);
-		if (ret == 1)
+		if (ret != NULL)
 			mlx5_translate_port_name(port_name, &data);
 	}
 	file = fopen(phys_switch_id, "rb");
Signature · 1 line
2.25.1
#1 lore raw
Quoted 33 lines · Ali Alnubani

Use fgets instead of fscanf to resolve the following warning reported by clang 14.0.0 in Fedora 37 (Rawhide):

drivers/net/mlx5/linux/mlx5_ethdev_os.c:1137:52: error:
'fscanf' may overflow; destination buffer in argument 3 has size 16, but the corresponding specifier may require size 17 [-Werror,-Wfortify-source]
ret = fscanf(file, "%" RTE_STR(IF_NAMESIZE) "s", port_name);

Fixes 63d1db710fbc ("net/mlx5: fix unlimited parsing of switch info")
---
 drivers/net/mlx5/linux/mlx5_ethdev_os.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/mlx5/linux/mlx5_ethdev_os.c +1 -1
index 8fe73f1adb..3d28597e7b 100644
@@ -1118,7 +1118,7 @@ mlx5_sysfs_switch_info(unsigned int ifindex, struct mlx5_switch_info *info)
        bool port_switch_id_set = false;
        bool device_dir = false;
        char c;
-       int ret;
+       char *ret;
 
        if (!if_indextoname(ifindex, ifname)) {
                rte_errno = errno;

drivers/net/mlx5/linux/mlx5_ethdev_os.c mlx5_sysfs_switch_info(unsigned int ifindex, struct mlx5_switch_info *info) · line 1140

Quoted 9 lines
drivers/net/mlx5/linux/mlx5_ethdev_os.c +2 -2
@@ -1134,9 +1134,9 @@ mlx5_sysfs_switch_info(unsigned int ifindex, struct mlx5_switch_info *info)
 
        file = fopen(phys_port_name, "rb");
        if (file != NULL) {
-               ret = fscanf(file, "%" RTE_STR(IF_NAMESIZE) "s", port_name);
+               ret = fgets(port_name, IF_NAMESIZE, file);
                fclose(file);
-               if (ret == 1)
+               if (ret != NULL)
                        mlx5_translate_port_name(port_name, &data);

You can directly check fgets return value and remove (misleading) variable ret from the global scope of this function.

Quoted 2 lines
drivers/net/mlx5/linux/mlx5_ethdev_os.c +0 -0
        }
        file = fopen(phys_switch_id, "rb");
Signature · 1 line
David Marchand
#2 lore raw

PATCH v2 1/1 net/mlx5: fix build with clang 14

In reply to Ali Alnubani

Use fgets instead of fscanf to resolve the following warning reported by clang 14.0.0 in Fedora 37 (Rawhide):

drivers/net/mlx5/linux/mlx5_ethdev_os.c:1137:52: error:
'fscanf' may overflow; destination buffer in argument 3 has size 16, but the corresponding specifier may require size 17 [-Werror,-Wfortify-source]
ret = fscanf(file, "%" RTE_STR(IF_NAMESIZE) "s", port_name);

Fixes 63d1db710fbc ("net/mlx5: fix unlimited parsing of switch info")

---
Changes in v2:
- Removed unnecessary variable.

 drivers/net/mlx5/linux/mlx5_ethdev_os.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/net/mlx5/linux/mlx5_ethdev_os.c +2 -4
index 8fe73f1adb..4db94c5917 100644
@@ -1118,7 +1118,6 @@ mlx5_sysfs_switch_info(unsigned int ifindex, struct mlx5_switch_info *info)
 	bool port_switch_id_set = false;
 	bool device_dir = false;
 	char c;
-	int ret;
 
 	if (!if_indextoname(ifindex, ifname)) {
 		rte_errno = errno;
@@ -1134,10 +1133,9 @@ mlx5_sysfs_switch_info(unsigned int ifindex, struct mlx5_switch_info *info)
 
 	file = fopen(phys_port_name, "rb");
 	if (file != NULL) {
-		ret = fscanf(file, "%" RTE_STR(IF_NAMESIZE) "s", port_name);
-		fclose(file);
-		if (ret == 1)
+		if (fgets(port_name, IF_NAMESIZE, file) != NULL)
 			mlx5_translate_port_name(port_name, &data);
+		fclose(file);
 	}
 	file = fopen(phys_switch_id, "rb");
 	if (file == NULL) {
Signature · 1 line
2.25.1
Acked-by on v2 1/1
#3 lore raw

11/05/2022 18:41, Ali Alnubani:

Quoted 8 lines

Use fgets instead of fscanf to resolve the following warning reported by clang 14.0.0 in Fedora 37 (Rawhide):

drivers/net/mlx5/linux/mlx5_ethdev_os.c:1137:52: error:
'fscanf' may overflow; destination buffer in argument 3 has size 16, but the corresponding specifier may require size 17 [-Werror,-Wfortify-source]
ret = fscanf(file, "%" RTE_STR(IF_NAMESIZE) "s", port_name);

Some other patches are proposing to declare the variable of size IF_NAMESIZE+1 but I think it's wrong because IF_NAMESIZE includes a terminating null byte.

Quoted 5 lines
Fixes 63d1db710fbc ("net/mlx5: fix unlimited parsing of switch info")

[...]

drivers/net/mlx5/linux/mlx5_ethdev_os.c mlx5_sysfs_switch_info(unsigned int ifindex, struct mlx5_switch_info *info) · line 1138

Quoted 6 lines
drivers/net/mlx5/linux/mlx5_ethdev_os.c +2 -3
-		ret = fscanf(file, "%" RTE_STR(IF_NAMESIZE) "s", port_name);
-		fclose(file);
-		if (ret == 1)
+		if (fgets(port_name, IF_NAMESIZE, file) != NULL)
 			mlx5_translate_port_name(port_name, &data);
+		fclose(file);
#4 lore raw
Quoted 11 lines · Thomas Monjalon

11/05/2022 18:41, Ali Alnubani:

Quoted 8 lines

Use fgets instead of fscanf to resolve the following warning reported by clang 14.0.0 in Fedora 37 (Rawhide):

drivers/net/mlx5/linux/mlx5_ethdev_os.c:1137:52: error:
'fscanf' may overflow; destination buffer in argument 3 has size 16, but the corresponding specifier may require size 17 [-Werror,-Wfortify-source]
ret = fscanf(file, "%" RTE_STR(IF_NAMESIZE) "s", port_name);

Quoted 3 lines

Some other patches are proposing to declare the variable of size IF_NAMESIZE+1 but I think it's wrong because IF_NAMESIZE includes a terminating null byte.

Ack, I rejected my patch accordingly.

Signature · 1 line
David Marchand
Acked-by on v2 1/1
#5 lore raw
In reply to Ali Alnubani
Quoted 16 lines

-----Original Message-----
From: Ali Alnubani <[email protected]>
Sent: Wednesday, May 11, 2022 19:41
To: [email protected]
Cc: Michael Baum <[email protected]>; [email protected]
Subject: [PATCH v2] net/mlx5: fix build with clang 14

Use fgets instead of fscanf to resolve the following warning reported by clang 14.0.0 in Fedora 37 (Rawhide):

drivers/net/mlx5/linux/mlx5_ethdev_os.c:1137:52: error:
'fscanf' may overflow; destination buffer in argument 3 has size 16, but the corresponding specifier may require size 17 [-Werror,-Wfortify-source]
ret = fscanf(file, "%" RTE_STR(IF_NAMESIZE) "s", port_name);

Quoted 5 lines
Fixes 63d1db710fbc ("net/mlx5: fix unlimited parsing of switch info")
#6 lore raw
In reply to Ali Alnubani

Hi,

Quoted 16 lines

-----Original Message-----
From: Ali Alnubani <[email protected]>
Sent: Wednesday, May 11, 2022 7:41 PM
To: [email protected]
Cc: Michael Baum <[email protected]>; [email protected]
Subject: [PATCH v2] net/mlx5: fix build with clang 14

Use fgets instead of fscanf to resolve the following warning reported by clang 14.0.0 in Fedora 37 (Rawhide):

drivers/net/mlx5/linux/mlx5_ethdev_os.c:1137:52: error:
'fscanf' may overflow; destination buffer in argument 3 has size 16, but the corresponding specifier may require size 17 [-Werror,-Wfortify-source]
ret = fscanf(file, "%" RTE_STR(IF_NAMESIZE) "s", port_name);

Quoted 9 lines
Fixes 63d1db710fbc ("net/mlx5: fix unlimited parsing of switch info")

---
Changes in v2:
- Removed unnecessary variable.

Patch applied to next-net-mlx,

Kindest regards,
Raslan Darawsheh