The commit is pushed to "branch-rh7-3.10.0-229.7.2.vz7.8.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git after rh7-3.10.0-229.7.2.vz7.6.8 ------> commit 48d88de87d8ce2bd7e69ba82e5410dd2ec82f602 Author: Andrew Vagin <ava...@openvz.org> Date: Tue Sep 8 12:50:52 2015 +0400
Revert "ve/rtnl: allow move network devices into network namespace in CT" This reverts commit b238eaaf8029c022899ee874132814bd1be5551f. https://jira.sw.ru/browse/PSBM-39077 Signed-off-by: Andrew Vagin <ava...@virtuozzo.com> Reviewed-by: Vladimir Davydov <vdavy...@virtuozzo.com> --- net/core/rtnetlink.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 2e8b10f..0d2df96 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -1403,8 +1403,7 @@ static int do_setlink(const struct sk_buff *skb, err = PTR_ERR(net); goto errout; } - if (!netlink_ns_capable(skb, net->user_ns, CAP_NET_ADMIN) && - !netlink_ns_capable(skb, net->user_ns, CAP_VE_NET_ADMIN)) { + if (!netlink_ns_capable(skb, net->user_ns, CAP_NET_ADMIN)) { err = -EPERM; goto errout; } _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel