diff options
| author | Steffen Klassert <steffen.klassert@secunet.com> | 2014-09-22 09:11:08 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-09-26 00:41:30 -0400 |
| commit | d61746b2e71bf612fb397b00242de5df5ba7f29a (patch) | |
| tree | 9a1c59c0c7fa60a3bc2c86c8e918addd14ab6d15 | |
| parent | b94d525e58dc9638dd3f98094cb468bcfb262039 (diff) | |
| download | blackbird-obmc-linux-d61746b2e71bf612fb397b00242de5df5ba7f29a.tar.gz blackbird-obmc-linux-d61746b2e71bf612fb397b00242de5df5ba7f29a.zip | |
ip_tunnel: Don't allow to add the same tunnel multiple times.
When we try to add an already existing tunnel, we don't return
an error. Instead we continue and call ip_tunnel_update().
This means that we can change existing tunnels by adding
the same tunnel multiple times. It is even possible to change
the tunnel endpoints of the fallback device.
We fix this by returning an error if we try to add an existing
tunnel.
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv4/ip_tunnel.c | 11 |
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) { |
