From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932346Ab1GLXiP (ORCPT ); Tue, 12 Jul 2011 19:38:15 -0400 Received: from 50-56-35-84.static.cloud-ips.com ([50.56.35.84]:58733 "EHLO mail" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753854Ab1GLXho (ORCPT ); Tue, 12 Jul 2011 19:37:44 -0400 From: Serge Hallyn To: linux-kernel@vger.kernel.org, containers@lists.linux-foundation.org Cc: dhowells@redhat.com, ebiederm@xmission.com, "Serge E. Hallyn" Subject: [RFC PATCH 12/14] user_ns: target af_key capability check Date: Tue, 12 Jul 2011 23:30:50 +0000 Message-Id: <1310513452-13397-13-git-send-email-serge@hallyn.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1310513452-13397-1-git-send-email-serge@hallyn.com> References: <1310513452-13397-1-git-send-email-serge@hallyn.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Serge E. Hallyn This presumes that it really is complete wrt network namespaces. Looking at the code it appears to be. Signed-off-by: Serge E. Hallyn Cc: Eric W. Biederman --- net/key/af_key.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/key/af_key.c b/net/key/af_key.c index 8f92cf8..414f409 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c @@ -141,7 +141,7 @@ static int pfkey_create(struct net *net, struct socket *sock, int protocol, struct sock *sk; int err; - if (!capable(CAP_NET_ADMIN)) + if (!ns_capable(net->user_ns, CAP_NET_ADMIN)) return -EPERM; if (sock->type != SOCK_RAW) return -ESOCKTNOSUPPORT; -- 1.7.4.1