1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
index 823fd64d0136..867466c96aac 100644
--- a/net/ipv6/ip6_gre.c
+++ b/net/ipv6/ip6_gre.c
@@ -1146,7 +1146,7 @@ static int ip6gre_tunnel_ioctl(struct net_device *dev,
        case SIOCADDTUNNEL:
        case SIOCCHGTUNNEL:
                err = -EPERM;
-                if (!capable(CAP_NET_ADMIN))
+                if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
                        goto done;
                err = -EFAULT;
@@ -1194,7 +1194,7 @@ static int ip6gre_tunnel_ioctl(struct net_device *dev,
        case SIOCDELTUNNEL:
                err = -EPERM;
-                if (!capable(CAP_NET_ADMIN))
+                if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
                        goto done;
                if (dev == ign->fb_tunnel_dev) {

diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index 823fd64d0136..867466c96aac 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c
@@ -1146,7 +1146,7 @@ static int ip6gre_tunnel_ioctl(struct net_device *dev,
1146	case SIOCADDTUNNEL:	1146	case SIOCADDTUNNEL:
1147	case SIOCCHGTUNNEL:	1147	case SIOCCHGTUNNEL:
1148	err = -EPERM;	1148	err = -EPERM;
1149	if (!capable(CAP_NET_ADMIN))	1149	if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
1150	goto done;	1150	goto done;
1151		1151
1152	err = -EFAULT;	1152	err = -EFAULT;
@@ -1194,7 +1194,7 @@ static int ip6gre_tunnel_ioctl(struct net_device *dev,
1194		1194
1195	case SIOCDELTUNNEL:	1195	case SIOCDELTUNNEL:
1196	err = -EPERM;	1196	err = -EPERM;
1197	if (!capable(CAP_NET_ADMIN))	1197	if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
1198	goto done;	1198	goto done;
1199		1199
1200	if (dev == ign->fb_tunnel_dev) {	1200	if (dev == ign->fb_tunnel_dev) {