netdev - Re: [PATCH net] ip6_tunnel: fix error code when tunnel exists

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 13 Mar 2015 06:43:47 -0700
From:	Eric Dumazet <eric.dumazet@...il.com>
To:	Nicolas Dichtel <nicolas.dichtel@...nd.com>
Cc:	davem@...emloft.net, netdev@...r.kernel.org,
	me@...rre-cheynier.net,
	Steffen Klassert <steffen.klassert@...unet.com>
Subject: Re: [PATCH net] ip6_tunnel: fix error code when tunnel exists

On Fri, 2015-03-13 at 13:58 +0100, Nicolas Dichtel wrote:
> After commit 2b0bb01b6edb, the kernel returns -ENOBUFS when user tries to add
> an existing tunnel with ioctl API:
> $ ip -6 tunnel add ip6tnl1 mode ip6ip6 dev eth1
> add tunnel "ip6tnl0" failed: No buffer space available
> 
> It's confusing, the right error is EEXIST.
> 
> Fixes: 2b0bb01b6edb ("ip6_tunnel: Return an error when adding an existing tunnel.")
> CC: Steffen Klassert <steffen.klassert@...unet.com>
> Reported-by: Pierre Cheynier <me@...rre-cheynier.net>
> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@...nd.com>
> ---
>  net/ipv6/ip6_tunnel.c | 22 +++++++++++++---------
>  1 file changed, 13 insertions(+), 9 deletions(-)
> 
> diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
> index 266a264ec212..7ba5608d64c5 100644
> --- a/net/ipv6/ip6_tunnel.c
> +++ b/net/ipv6/ip6_tunnel.c
> @@ -380,7 +380,7 @@ static struct ip6_tnl *ip6_tnl_locate(struct net *net,
>  		if (ipv6_addr_equal(local, &t->parms.laddr) &&
>  		    ipv6_addr_equal(remote, &t->parms.raddr)) {
>  			if (create)
> -				return NULL;
> +				return ERR_PTR(-EEXIST);
>  
>  			return t;
>  		}
> @@ -1420,7 +1420,7 @@ ip6_tnl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
>  			}
>  			ip6_tnl_parm_from_user(&p1, &p);
>  			t = ip6_tnl_locate(net, &p1, 0);
> -			if (t == NULL)
> +			if (IS_ERR_OR_NULL(t))

These IS_ERR_OR_NULL(t) looks like defensive/lazy programming to me.

A NULL pointer should not be allowed here.

If t is not valid, it should be a plain error code mapping.

I wish we get rid of all IS_ERR_OR_NULL() uses in networking tree,
instead of adding plenty of them.


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html