diff mbox series

net/mlx5: add missing return value check

Message ID 20190321090652.32535-1-alialnu@mellanox.com (mailing list archive)
State Accepted, archived
Delegated to: Shahaf Shuler
Headers
Series net/mlx5: add missing return value check |

Checks

Context Check Description
ci/Intel-compilation success Compilation OK
ci/checkpatch success coding style OK
ci/intel-Performance-Testing success Performance Testing PASS
ci/mellanox-Performance-Testing success Performance Testing PASS

Commit Message

Ali Alnubani March 21, 2019, 9:07 a.m. UTC 
  Fixes: d86406b965df ("net/mlx5: support new representor naming format")
Cc: dekelp@mellanox.com

Signed-off-by: Ali Alnubani <alialnu@mellanox.com>
---
 drivers/net/mlx5/mlx5_ethdev.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Slava Ovsiienko March 21, 2019, 9:26 a.m. UTC | #1 
Acked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>

> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Ali Alnubani
> Sent: Thursday, March 21, 2019 11:07
> To: dev@dpdk.org
> Cc: Shahaf Shuler <shahafs@mellanox.com>; Dekel Peled
> <dekelp@mellanox.com>
> Subject: [dpdk-dev] [PATCH] net/mlx5: add missing return value check
> 
> Fixes: d86406b965df ("net/mlx5: support new representor naming format")
> Cc: dekelp@mellanox.com
> 
> Signed-off-by: Ali Alnubani <alialnu@mellanox.com>
> ---
>  drivers/net/mlx5/mlx5_ethdev.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_ethdev.c
> b/drivers/net/mlx5/mlx5_ethdev.c index 84d761c8e..1fd988998 100644
> --- a/drivers/net/mlx5/mlx5_ethdev.c
> +++ b/drivers/net/mlx5/mlx5_ethdev.c
> @@ -1365,6 +1365,7 @@ mlx5_sysfs_switch_info(unsigned int ifindex, struct
> mlx5_switch_info *info)
>  	bool port_name_set = false;
>  	bool port_switch_id_set = false;
>  	char c;
> +	int ret;
> 
>  	if (!if_indextoname(ifindex, ifname)) {
>  		rte_errno = errno;
> @@ -1378,9 +1379,10 @@ mlx5_sysfs_switch_info(unsigned int ifindex,
> struct mlx5_switch_info *info)
> 
>  	file = fopen(phys_port_name, "rb");
>  	if (file != NULL) {
> -		fscanf(file, "%s", port_name);
> +		ret = fscanf(file, "%s", port_name);
>  		fclose(file);
> -		port_name_set = mlx5_translate_port_name(port_name,
> &data);
> +		if (ret == 1)
> +			port_name_set =
> mlx5_translate_port_name(port_name, &data);
>  	}
>  	file = fopen(phys_switch_id, "rb");
>  	if (file == NULL) {
> --
> 2.19.2
Dekel Peled March 21, 2019, 9:34 a.m. UTC | #2 
> -----Original Message-----
> From: Ali Alnubani
> Sent: Thursday, March 21, 2019 11:07 AM
> To: dev@dpdk.org
> Cc: Shahaf Shuler <shahafs@mellanox.com>; Dekel Peled
> <dekelp@mellanox.com>
> Subject: [PATCH] net/mlx5: add missing return value check
> 
> Fixes: d86406b965df ("net/mlx5: support new representor naming format")
> Cc: dekelp@mellanox.com
> 
> Signed-off-by: Ali Alnubani <alialnu@mellanox.com>
> ---
>  drivers/net/mlx5/mlx5_ethdev.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_ethdev.c
> b/drivers/net/mlx5/mlx5_ethdev.c index 84d761c8e..1fd988998 100644
> --- a/drivers/net/mlx5/mlx5_ethdev.c
> +++ b/drivers/net/mlx5/mlx5_ethdev.c
> @@ -1365,6 +1365,7 @@ mlx5_sysfs_switch_info(unsigned int ifindex, struct
> mlx5_switch_info *info)
>  	bool port_name_set = false;
>  	bool port_switch_id_set = false;
>  	char c;
> +	int ret;
> 
>  	if (!if_indextoname(ifindex, ifname)) {
>  		rte_errno = errno;
> @@ -1378,9 +1379,10 @@ mlx5_sysfs_switch_info(unsigned int ifindex,
> struct mlx5_switch_info *info)
> 
>  	file = fopen(phys_port_name, "rb");
>  	if (file != NULL) {
> -		fscanf(file, "%s", port_name);
> +		ret = fscanf(file, "%s", port_name);
>  		fclose(file);
> -		port_name_set = mlx5_translate_port_name(port_name,
> &data);
> +		if (ret == 1)
> +			port_name_set =
> mlx5_translate_port_name(port_name, &data);
>  	}
>  	file = fopen(phys_switch_id, "rb");
>  	if (file == NULL) {
> --
> 2.19.2

Acked by: Dekel Peled <dekelp@mellanox.com>
Shahaf Shuler March 24, 2019, 9:26 a.m. UTC | #3 
Thursday, March 21, 2019 11:34 AM, Dekel Peled:
> Subject: RE: [PATCH] net/mlx5: add missing return value check
> 
> > -----Original Message-----
> > From: Ali Alnubani
> > Sent: Thursday, March 21, 2019 11:07 AM
> > To: dev@dpdk.org
> > Cc: Shahaf Shuler <shahafs@mellanox.com>; Dekel Peled
> > <dekelp@mellanox.com>
> > Subject: [PATCH] net/mlx5: add missing return value check
> >
> > Fixes: d86406b965df ("net/mlx5: support new representor naming
> > format")
> > Cc: dekelp@mellanox.com
> >
> > Signed-off-by: Ali Alnubani <alialnu@mellanox.com>

Applied to next-net-mlx, thanks.
Ferruh Yigit March 25, 2019, 12:02 p.m. UTC | #4 
On 3/24/2019 9:26 AM, Shahaf Shuler wrote:
> Thursday, March 21, 2019 11:34 AM, Dekel Peled:
>> Subject: RE: [PATCH] net/mlx5: add missing return value check
>>
>>> -----Original Message-----
>>> From: Ali Alnubani
>>> Sent: Thursday, March 21, 2019 11:07 AM
>>> To: dev@dpdk.org
>>> Cc: Shahaf Shuler <shahafs@mellanox.com>; Dekel Peled
>>> <dekelp@mellanox.com>
>>> Subject: [PATCH] net/mlx5: add missing return value check
>>>
>>> Fixes: d86406b965df ("net/mlx5: support new representor naming
>>> format")
>>> Cc: dekelp@mellanox.com
>>>
>>> Signed-off-by: Ali Alnubani <alialnu@mellanox.com>
> 
> Applied to next-net-mlx, thanks. 
> 

Squashed into relevant commit [1] in next-net, thanks.

[1]
net/mlx5: support new representor naming format
Ferruh Yigit March 27, 2019, 9:31 a.m. UTC | #5 
On 3/25/2019 12:02 PM, Ferruh Yigit wrote:
> On 3/24/2019 9:26 AM, Shahaf Shuler wrote:
>> Thursday, March 21, 2019 11:34 AM, Dekel Peled:
>>> Subject: RE: [PATCH] net/mlx5: add missing return value check
>>>
>>>> -----Original Message-----
>>>> From: Ali Alnubani
>>>> Sent: Thursday, March 21, 2019 11:07 AM
>>>> To: dev@dpdk.org
>>>> Cc: Shahaf Shuler <shahafs@mellanox.com>; Dekel Peled
>>>> <dekelp@mellanox.com>
>>>> Subject: [PATCH] net/mlx5: add missing return value check
>>>>
>>>> Fixes: d86406b965df ("net/mlx5: support new representor naming
>>>> format")
>>>> Cc: dekelp@mellanox.com
>>>>
>>>> Signed-off-by: Ali Alnubani <alialnu@mellanox.com>
>>
>> Applied to next-net-mlx, thanks. 
>>
> 
> Squashed into relevant commit [1] in next-net, thanks.
> 
> [1]
> net/mlx5: support new representor naming format
> 

'main' repo get the original patch without squash, so can't squash now,
merged as a incremental patch ...

Applied to dpdk-next-net/master, thanks.
Ali Alnubani March 28, 2019, 10:29 a.m. UTC | #6 
Hi Ferruh,

> -----Original Message-----
> From: Ferruh Yigit <ferruh.yigit@intel.com>
> Sent: Wednesday, March 27, 2019 11:31 AM
> To: Shahaf Shuler <shahafs@mellanox.com>; Dekel Peled
> <dekelp@mellanox.com>; Ali Alnubani <alialnu@mellanox.com>;
> dev@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH] net/mlx5: add missing return value check
> 
> On 3/25/2019 12:02 PM, Ferruh Yigit wrote:
> > On 3/24/2019 9:26 AM, Shahaf Shuler wrote:
> >> Thursday, March 21, 2019 11:34 AM, Dekel Peled:
> >>> Subject: RE: [PATCH] net/mlx5: add missing return value check
> >>>
> >>>> -----Original Message-----
> >>>> From: Ali Alnubani
> >>>> Sent: Thursday, March 21, 2019 11:07 AM
> >>>> To: dev@dpdk.org
> >>>> Cc: Shahaf Shuler <shahafs@mellanox.com>; Dekel Peled
> >>>> <dekelp@mellanox.com>
> >>>> Subject: [PATCH] net/mlx5: add missing return value check
> >>>>
> >>>> Fixes: d86406b965df ("net/mlx5: support new representor naming
> >>>> format")
> >>>> Cc: dekelp@mellanox.com
> >>>>
> >>>> Signed-off-by: Ali Alnubani <alialnu@mellanox.com>
> >>
> >> Applied to next-net-mlx, thanks.
> >>
> >
> > Squashed into relevant commit [1] in next-net, thanks.
> >
> > [1]
> > net/mlx5: support new representor naming format
> >
> 
> 'main' repo get the original patch without squash, so can't squash now,
> merged as a incremental patch ...
> 
> Applied to dpdk-next-net/master, thanks.

A more detailed commit body:

This patch fixes the build failure with message:
    drivers/net/mlx5/mlx5_ethdev.c: In function ‘mlx5_sysfs_switch_info’:
    drivers/net/mlx5/mlx5_ethdev.c:1381:3: error: ignoring return value
    of ‘fscanf’, declared with attribute warn_unused_result [-Werror=unused-result]
    fscanf(file, "%s", port_name);
    ^
Which reproduces on Ubuntu 16.04 LTS with
gcc (Ubuntu 5.4.0-6ubuntu1~16.04.10) 5.4.0 20160609.

Fixes: b2f3a3810125 ("net/mlx5: support new representor naming format")

Signed-off-by: Ali Alnubani <alialnu@mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
Acked-by: Dekel Peled <dekelp@mellanox.com>


Thanks,
Ali
Ferruh Yigit March 28, 2019, 6:28 p.m. UTC | #7 
On 3/28/2019 10:29 AM, Ali Alnubani wrote:
> Hi Ferruh,
> 
>> -----Original Message-----
>> From: Ferruh Yigit <ferruh.yigit@intel.com>
>> Sent: Wednesday, March 27, 2019 11:31 AM
>> To: Shahaf Shuler <shahafs@mellanox.com>; Dekel Peled
>> <dekelp@mellanox.com>; Ali Alnubani <alialnu@mellanox.com>;
>> dev@dpdk.org
>> Subject: Re: [dpdk-dev] [PATCH] net/mlx5: add missing return value check
>>
>> On 3/25/2019 12:02 PM, Ferruh Yigit wrote:
>>> On 3/24/2019 9:26 AM, Shahaf Shuler wrote:
>>>> Thursday, March 21, 2019 11:34 AM, Dekel Peled:
>>>>> Subject: RE: [PATCH] net/mlx5: add missing return value check
>>>>>
>>>>>> -----Original Message-----
>>>>>> From: Ali Alnubani
>>>>>> Sent: Thursday, March 21, 2019 11:07 AM
>>>>>> To: dev@dpdk.org
>>>>>> Cc: Shahaf Shuler <shahafs@mellanox.com>; Dekel Peled
>>>>>> <dekelp@mellanox.com>
>>>>>> Subject: [PATCH] net/mlx5: add missing return value check
>>>>>>
>>>>>> Fixes: d86406b965df ("net/mlx5: support new representor naming
>>>>>> format")
>>>>>> Cc: dekelp@mellanox.com
>>>>>>
>>>>>> Signed-off-by: Ali Alnubani <alialnu@mellanox.com>
>>>>
>>>> Applied to next-net-mlx, thanks.
>>>>
>>>
>>> Squashed into relevant commit [1] in next-net, thanks.
>>>
>>> [1]
>>> net/mlx5: support new representor naming format
>>>
>>
>> 'main' repo get the original patch without squash, so can't squash now,
>> merged as a incremental patch ...
>>
>> Applied to dpdk-next-net/master, thanks.
> 
> A more detailed commit body:
> 
> This patch fixes the build failure with message:
>     drivers/net/mlx5/mlx5_ethdev.c: In function ‘mlx5_sysfs_switch_info’:
>     drivers/net/mlx5/mlx5_ethdev.c:1381:3: error: ignoring return value
>     of ‘fscanf’, declared with attribute warn_unused_result [-Werror=unused-result]
>     fscanf(file, "%s", port_name);
>     ^
> Which reproduces on Ubuntu 16.04 LTS with
> gcc (Ubuntu 5.4.0-6ubuntu1~16.04.10) 5.4.0 20160609.
> 
> Fixes: b2f3a3810125 ("net/mlx5: support new representor naming format")
> 
> Signed-off-by: Ali Alnubani <alialnu@mellanox.com>
> Acked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
> Acked-by: Dekel Peled <dekelp@mellanox.com>

Commit log updated in next-net as suggested, thanks.
diff mbox series

Patch

diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
index 84d761c8e..1fd988998 100644
--- a/drivers/net/mlx5/mlx5_ethdev.c
+++ b/drivers/net/mlx5/mlx5_ethdev.c
@@ -1365,6 +1365,7 @@  mlx5_sysfs_switch_info(unsigned int ifindex, struct mlx5_switch_info *info)
 	bool port_name_set = false;
 	bool port_switch_id_set = false;
 	char c;
+	int ret;
 
 	if (!if_indextoname(ifindex, ifname)) {
 		rte_errno = errno;
@@ -1378,9 +1379,10 @@  mlx5_sysfs_switch_info(unsigned int ifindex, struct mlx5_switch_info *info)
 
 	file = fopen(phys_port_name, "rb");
 	if (file != NULL) {
-		fscanf(file, "%s", port_name);
+		ret = fscanf(file, "%s", port_name);
 		fclose(file);
-		port_name_set = mlx5_translate_port_name(port_name, &data);
+		if (ret == 1)
+			port_name_set = mlx5_translate_port_name(port_name, &data);
 	}
 	file = fopen(phys_switch_id, "rb");
 	if (file == NULL) {