From patchwork Tue Jul 26 18:58:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Serge E. Hallyn" X-Patchwork-Id: 106924 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 0BE3AB6F83 for ; Wed, 27 Jul 2011 05:07:13 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753532Ab1GZTHJ (ORCPT ); Tue, 26 Jul 2011 15:07:09 -0400 Received: from 50-56-35-84.static.cloud-ips.com ([50.56.35.84]:50592 "EHLO mail" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752159Ab1GZTGl (ORCPT ); Tue, 26 Jul 2011 15:06:41 -0400 Received: by mail (Postfix, from userid 1000) id AD3E3100EFB; Tue, 26 Jul 2011 18:58:46 +0000 (UTC) From: Serge Hallyn To: linux-kernel@vger.kernel.org Cc: dhowells@redhat.com, ebiederm@xmission.com, containers@lists.linux-foundation.org, netdev@vger.kernel.org, akpm@osdl.org, "Serge E. Hallyn" Subject: [PATCH 12/14] user_ns: target af_key capability check Date: Tue, 26 Jul 2011 18:58:35 +0000 Message-Id: <1311706717-7398-13-git-send-email-serge@hallyn.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1311706717-7398-1-git-send-email-serge@hallyn.com> References: <1311706717-7398-1-git-send-email-serge@hallyn.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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 1e733e9..1f90f4e 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;