diff options
Diffstat (limited to 'net/ipv4/ip_vti.c')
| -rw-r--r-- | net/ipv4/ip_vti.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c index f4a825d3bd7f..c3a4233c0ac2 100644 --- a/net/ipv4/ip_vti.c +++ b/net/ipv4/ip_vti.c | |||
| @@ -488,7 +488,7 @@ vti_tunnel_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) | |||
| 488 | case SIOCADDTUNNEL: | 488 | case SIOCADDTUNNEL: |
| 489 | case SIOCCHGTUNNEL: | 489 | case SIOCCHGTUNNEL: |
| 490 | err = -EPERM; | 490 | err = -EPERM; |
| 491 | if (!capable(CAP_NET_ADMIN)) | 491 | if (!ns_capable(net->user_ns, CAP_NET_ADMIN)) |
| 492 | goto done; | 492 | goto done; |
| 493 | 493 | ||
| 494 | err = -EFAULT; | 494 | err = -EFAULT; |
| @@ -553,7 +553,7 @@ vti_tunnel_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) | |||
| 553 | 553 | ||
| 554 | case SIOCDELTUNNEL: | 554 | case SIOCDELTUNNEL: |
| 555 | err = -EPERM; | 555 | err = -EPERM; |
| 556 | if (!capable(CAP_NET_ADMIN)) | 556 | if (!ns_capable(net->user_ns, CAP_NET_ADMIN)) |
| 557 | goto done; | 557 | goto done; |
| 558 | 558 | ||
| 559 | if (dev == ipn->fb_tunnel_dev) { | 559 | if (dev == ipn->fb_tunnel_dev) { |