net/mlx5: fix invalid error check

Message ID 20180627091909.22689-1-adrien.mazarguil@6wind.com (mailing list archive)
State Accepted, archived
Delegated to: Shahaf Shuler
Headers
Series net/mlx5: fix invalid error check |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Adrien Mazarguil June 27, 2018, 9:20 a.m. UTC
  Since its return type is unsigned, if_nametoindex() returns 0 in case of
error, never -1.

Fixes: ccdcba53a3f4 ("net/mlx5: use Netlink to add/remove MAC addresses")
Cc: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
Cc: stable@dpdk.org

Signed-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
---
 drivers/net/mlx5/mlx5_ethdev.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
  

Comments

Nélio Laranjeiro June 27, 2018, 11:55 a.m. UTC | #1
On Wed, Jun 27, 2018 at 11:20:52AM +0200, Adrien Mazarguil wrote:
> Since its return type is unsigned, if_nametoindex() returns 0 in case of
> error, never -1.
> 
> Fixes: ccdcba53a3f4 ("net/mlx5: use Netlink to add/remove MAC addresses")
> Cc: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
> Cc: stable@dpdk.org
> 
> Signed-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>

> ---
>  drivers/net/mlx5/mlx5_ethdev.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
> index 90488af33..ebe5cb6e3 100644
> --- a/drivers/net/mlx5/mlx5_ethdev.c
> +++ b/drivers/net/mlx5/mlx5_ethdev.c
> @@ -192,13 +192,13 @@ int
>  mlx5_ifindex(const struct rte_eth_dev *dev)
>  {
>  	char ifname[IF_NAMESIZE];
> -	int ret;
> +	unsigned int ret;
>  
>  	ret = mlx5_get_ifname(dev, &ifname);
>  	if (ret)
>  		return ret;
>  	ret = if_nametoindex(ifname);
> -	if (ret == -1) {
> +	if (ret == 0) {
>  		rte_errno = errno;
>  		return -rte_errno;
>  	}
> -- 
> 2.11.0

Thanks,
  
Shahaf Shuler June 28, 2018, 6:39 a.m. UTC | #2
Wednesday, June 27, 2018 2:55 PM, Nélio Laranjeiro:
> Subject: Re: [PATCH] net/mlx5: fix invalid error check
> 
> On Wed, Jun 27, 2018 at 11:20:52AM +0200, Adrien Mazarguil wrote:
> > Since its return type is unsigned, if_nametoindex() returns 0 in case
> > of error, never -1.
> >
> > Fixes: ccdcba53a3f4 ("net/mlx5: use Netlink to add/remove MAC
> > addresses")
> > Cc: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
> Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>

Applied to next-net-mlx, thanks. 

> 
> > ---
> >  drivers/net/mlx5/mlx5_ethdev.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/net/mlx5/mlx5_ethdev.c
> > b/drivers/net/mlx5/mlx5_ethdev.c index 90488af33..ebe5cb6e3 100644
> > --- a/drivers/net/mlx5/mlx5_ethdev.c
> > +++ b/drivers/net/mlx5/mlx5_ethdev.c
> > @@ -192,13 +192,13 @@ int
> >  mlx5_ifindex(const struct rte_eth_dev *dev)  {
> >  	char ifname[IF_NAMESIZE];
> > -	int ret;
> > +	unsigned int ret;
> >
> >  	ret = mlx5_get_ifname(dev, &ifname);
> >  	if (ret)
> >  		return ret;
> >  	ret = if_nametoindex(ifname);
> > -	if (ret == -1) {
> > +	if (ret == 0) {
> >  		rte_errno = errno;
> >  		return -rte_errno;
> >  	}
> > --
> > 2.11.0
> 
> Thanks,
> 
> --
> Nélio Laranjeiro
> 6WIND
  

Patch

diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
index 90488af33..ebe5cb6e3 100644
--- a/drivers/net/mlx5/mlx5_ethdev.c
+++ b/drivers/net/mlx5/mlx5_ethdev.c
@@ -192,13 +192,13 @@  int
 mlx5_ifindex(const struct rte_eth_dev *dev)
 {
 	char ifname[IF_NAMESIZE];
-	int ret;
+	unsigned int ret;
 
 	ret = mlx5_get_ifname(dev, &ifname);
 	if (ret)
 		return ret;
 	ret = if_nametoindex(ifname);
-	if (ret == -1) {
+	if (ret == 0) {
 		rte_errno = errno;
 		return -rte_errno;
 	}