1 files changed, 8 insertions, 3 deletions

diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
index bd41dd1948b6..bda4bb8ae260 100644
--- a/net/ipv4/ip_tunnel.c
+++ b/net/ipv4/ip_tunnel.c
@@ -764,9 +764,14 @@ 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)) {
-                        t = ip_tunnel_create(net, itn, p);
-                        err = PTR_ERR_OR_ZERO(t);
+                if (cmd == SIOCADDTUNNEL) {
+                        if (!t) {
+                                t = ip_tunnel_create(net, itn, p);
+                                err = PTR_ERR_OR_ZERO(t);
+                                break;
+                        }
+
+                        err = -EEXIST;
                         break;
                 }
                 if (dev != itn->fb_tunnel_dev && cmd == SIOCCHGTUNNEL) {