|
@@ -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:
|