From patchwork Mon Oct 9 12:59:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matteo Croce X-Patchwork-Id: 823237 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y9gM06B2Lz9tXv for ; Mon, 9 Oct 2017 23:59:56 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754397AbdJIM7w (ORCPT ); Mon, 9 Oct 2017 08:59:52 -0400 Received: from mail-wm0-f45.google.com ([74.125.82.45]:43243 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754352AbdJIM7o (ORCPT ); Mon, 9 Oct 2017 08:59:44 -0400 Received: by mail-wm0-f45.google.com with SMTP id m72so11461584wmc.0 for ; Mon, 09 Oct 2017 05:59:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=RVhdNko7vk5Q+PVX2zaPiM0iAiFemKIRW2GXTCRKRwA=; b=c9ZcjEz0MNUspGXyIbEnTBfLNg3uem/VdfGn5rpksRVFiLjq3mz+ta13FJXJbENvDZ 4y3guaCUqxg/OXw2MxdY5kLoOqYxEzQRpefkqtCLf7b4UNFZaAiptcCLG8CZygFX9VwP 7PVk8zvY+3G11+FfTFzBVCU4VJVBJ7etYLVHWks29sImStwa+wUK1PutyVoQdWxEXVkJ SeEFInTJ6L/Wfo2JrPKCXionGn3+OAQFyGUTvF877sm6UEGJPBRr3O7b2JpuzFiCv5kO fUEWkJWE+8PjE/PB3gCR75J2pla8jCJUt8Ol5bk6kPUiCk3LaSoAjrG5NcaLs1Bhna3N zrJw== X-Gm-Message-State: AMCzsaWT2rXue9JcOrsiEwXkFvMYjT2qWZ6zIjw+/cW9enNlmu6f80r3 026PEY25h/uQlUhjjapH/zYWl/JUeFU= X-Google-Smtp-Source: AOwi7QDdf/9VwsYCHIxsSSBZA6DZ3vG8PJi2XmirOGLoWdEktj0vKs11zqdy5Cs0zsb72XUJ3N0a1A== X-Received: by 10.28.152.5 with SMTP id a5mr8902724wme.131.1507553983510; Mon, 09 Oct 2017 05:59:43 -0700 (PDT) Received: from mcroce.mxp.redhat.com (nat-pool-mxp-t.redhat.com. [149.6.153.186]) by smtp.gmail.com with ESMTPSA id m19sm4019019wma.24.2017.10.09.05.59.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 09 Oct 2017 05:59:42 -0700 (PDT) From: Matteo Croce To: Paul Mackerras , linux-ppp@vger.kernel.org, netdev@vger.kernel.org Cc: David Miller Subject: [RFC net-next] ppp: allow usage in namespaces Date: Mon, 9 Oct 2017 14:59:41 +0200 Message-Id: <20171009125941.15452-1-mcroce@redhat.com> X-Mailer: git-send-email 2.13.6 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Check for CAP_NET_ADMIN with ns_capable() instead of capable() to allow usage of ppp in user namespace other than the init one. Signed-off-by: Matteo Croce --- drivers/net/ppp/ppp_generic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c index a404552555d4..be5634b4835b 100644 --- a/drivers/net/ppp/ppp_generic.c +++ b/drivers/net/ppp/ppp_generic.c @@ -389,7 +389,7 @@ static int ppp_open(struct inode *inode, struct file *file) /* * This could (should?) be enforced by the permissions on /dev/ppp. */ - if (!capable(CAP_NET_ADMIN)) + if (!ns_capable(file->f_cred->user_ns, CAP_NET_ADMIN)) return -EPERM; return 0; }