ip_tunnel: return more precise errno value when adding tunnel fails
Subsystems (3)
PATCH v3 1/1 ip_tunnel: return more precise errno value when adding tunnel fails
Currently this always returns ENOBUFS, because the return value of __ip_tunnel_create is discarded.
A more common failure is a duplicate name (EEXIST). Propagate the real error code so userspace can display a more meaningful error message.
---
Changes since v2:
Fix subject prefix (s/gre/ip_tunnel/)
Changes since v1:
Use ERR_CAST() (suggested by Ben Hutchings)
net/ipv4/ip_tunnel.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
net/ipv4/ip_tunnel.c +10 -5
@@ -443,7 +443,7 @@ static struct ip_tunnel *ip_tunnel_create(struct net *net, fbt =netdev_priv (itn->fb_tunnel_dev); dev =__ip_tunnel_create (net, itn->fb_tunnel_dev->rtnl_link_ops, parms);if (IS_ERR (dev)) -return NULL ; +return ERR_CAST (dev); dev->mtu =ip_tunnel_bind_dev (dev);
@@ -796,9 +796,13 @@ int ip_tunnel_ioctl(struct net_device *dev, struct ip_tunnel_parm *p, int cmd) t =ip_tunnel_find (itn, p, itn->fb_tunnel_dev->type); -if (!t && (cmd ==SIOCADDTUNNEL )) +if (!t && (cmd ==SIOCADDTUNNEL )) { t =ip_tunnel_create (net, itn, p); - +if (IS_ERR (t)) { + err =PTR_ERR (t); +break ; + } + }if (dev != itn->fb_tunnel_dev && cmd ==SIOCCHGTUNNEL ) {if (t !=NULL ) {if (t->dev != dev) {
@@ -825,8 +829,9 @@ int ip_tunnel_ioctl(struct net_device *dev, struct ip_tunnel_parm *p, int cmd)if (t) { err =0 ;ip_tunnel_update (itn, t, dev, p, true); - }else - err = (cmd ==SIOCADDTUNNEL ? -ENOBUFS : -ENOENT ); + }else { + err = -ENOENT ; + }break ;case SIOCDELTUNNEL :
Signature · 1 line
1.8.1.5
From: Florian Westphal <[email protected]>
Date: Fri, 14 Feb 2014 13:14:39 +0100
Quoted 7 lines
Currently this always returns ENOBUFS, because the return value of
__ip_tunnel_createis discarded.A more common failure is a duplicate name (EEXIST). Propagate the real error code so userspace can display a more meaningful error message.
Signed-off-by Florian Westphal <[email protected]>
Applied, thanks Florian.