* [PATCH] net/mlx5: fix build with clang 14
@ 2022-05-11 13:58 Ali Alnubani
2022-05-11 14:04 ` David Marchand
2022-05-11 16:41 ` [PATCH v2] " Ali Alnubani
0 siblings, 2 replies; 4+ messages in thread
From: Ali Alnubani @ 2022-05-11 13:58 UTC (permalink / raw)
To: dev; +Cc: michaelba, stable
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")
Cc: michaelba@mellanox.com
Cc: stable@dpdk.org
Signed-off-by: Ali Alnubani <alialnu@nvidia.com>
---
drivers/net/mlx5/linux/mlx5_ethdev_os.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/mlx5/linux/mlx5_ethdev_os.c b/drivers/net/mlx5/linux/mlx5_ethdev_os.c
index 8fe73f1adb..3d28597e7b 100644
--- a/drivers/net/mlx5/linux/mlx5_ethdev_os.c
+++ b/drivers/net/mlx5/linux/mlx5_ethdev_os.c
@@ -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");
--
2.25.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] net/mlx5: fix build with clang 14
2022-05-11 13:58 [PATCH] net/mlx5: fix build with clang 14 Ali Alnubani
@ 2022-05-11 14:04 ` David Marchand
2022-05-11 16:41 ` [PATCH v2] " Ali Alnubani
1 sibling, 0 replies; 4+ messages in thread
From: David Marchand @ 2022-05-11 14:04 UTC (permalink / raw)
To: Ali Alnubani; +Cc: dev, michaelba, dpdk stable
On Wed, May 11, 2022 at 3:59 PM Ali Alnubani <alialnu@nvidia.com> wrote:
>
> 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")
> Cc: michaelba@mellanox.com
> Cc: stable@dpdk.org
>
> Signed-off-by: Ali Alnubani <alialnu@nvidia.com>
> ---
> drivers/net/mlx5/linux/mlx5_ethdev_os.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/mlx5/linux/mlx5_ethdev_os.c b/drivers/net/mlx5/linux/mlx5_ethdev_os.c
> index 8fe73f1adb..3d28597e7b 100644
> --- a/drivers/net/mlx5/linux/mlx5_ethdev_os.c
> +++ b/drivers/net/mlx5/linux/mlx5_ethdev_os.c
> @@ -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);
You can directly check fgets return value and remove (misleading)
variable ret from the global scope of this function.
> }
> file = fopen(phys_switch_id, "rb");
--
David Marchand
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2] net/mlx5: fix build with clang 14
2022-05-11 13:58 [PATCH] net/mlx5: fix build with clang 14 Ali Alnubani
2022-05-11 14:04 ` David Marchand
@ 2022-05-11 16:41 ` Ali Alnubani
1 sibling, 0 replies; 4+ messages in thread
From: Ali Alnubani @ 2022-05-11 16:41 UTC (permalink / raw)
To: dev; +Cc: michaelba, stable
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")
Cc: michaelba@mellanox.com
Cc: stable@dpdk.org
Signed-off-by: Ali Alnubani <alialnu@nvidia.com>
---
Changes in v2:
- Removed unnecessary variable.
drivers/net/mlx5/linux/mlx5_ethdev_os.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/net/mlx5/linux/mlx5_ethdev_os.c b/drivers/net/mlx5/linux/mlx5_ethdev_os.c
index 8fe73f1adb..4db94c5917 100644
--- a/drivers/net/mlx5/linux/mlx5_ethdev_os.c
+++ b/drivers/net/mlx5/linux/mlx5_ethdev_os.c
@@ -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) {
--
2.25.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] net/mlx5: fix build with clang 14
@ 2022-05-18 9:11 David Marchand
0 siblings, 0 replies; 4+ messages in thread
From: David Marchand @ 2022-05-18 9:11 UTC (permalink / raw)
To: dev; +Cc: stable, Matan Azrad, Viacheslav Ovsiienko, Michael Baum, Ophir Munk
clang 14 raises the following warning:
../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);
Extend port_name so that it can fit a null terminated string.
Fixes: 63d1db710fbc ("net/mlx5: fix unlimited parsing of switch info")
Fixes: 1256805dd54d ("net/mlx5: move Linux-specific functions")
Cc: stable@dpdk.org
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
drivers/net/mlx5/linux/mlx5_ethdev_os.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/mlx5/linux/mlx5_ethdev_os.c b/drivers/net/mlx5/linux/mlx5_ethdev_os.c
index 8fe73f1adb..e0a22ac78f 100644
--- a/drivers/net/mlx5/linux/mlx5_ethdev_os.c
+++ b/drivers/net/mlx5/linux/mlx5_ethdev_os.c
@@ -1105,7 +1105,7 @@ int
mlx5_sysfs_switch_info(unsigned int ifindex, struct mlx5_switch_info *info)
{
char ifname[IF_NAMESIZE];
- char port_name[IF_NAMESIZE];
+ char port_name[IF_NAMESIZE + 1];
FILE *file;
struct mlx5_switch_info data = {
.master = 0,
--
2.36.1
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-05-18 9:11 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-11 13:58 [PATCH] net/mlx5: fix build with clang 14 Ali Alnubani
2022-05-11 14:04 ` David Marchand
2022-05-11 16:41 ` [PATCH v2] " Ali Alnubani
2022-05-18 9:11 [PATCH] " David Marchand
patches for DPDK stable branches
This inbox may be cloned and mirrored by anyone:
git clone --mirror http://inbox.dpdk.org/stable/0 stable/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 stable stable/ http://inbox.dpdk.org/stable \
stable@dpdk.org
public-inbox-index stable
Example config snippet for mirrors.
Newsgroup available over NNTP:
nntp://inbox.dpdk.org/inbox.dpdk.stable
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git