Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932502AbbEWTpm (ORCPT ); Sat, 23 May 2015 15:45:42 -0400 Received: from h2.hallyn.com ([78.46.35.8]:46236 "EHLO h2.hallyn.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932189AbbEWTph (ORCPT ); Sat, 23 May 2015 15:45:37 -0400 Date: Sat, 23 May 2015 14:45:35 -0500 From: "Serge E. Hallyn" To: Andy Lutomirski Cc: Serge Hallyn , Andrew Morton , Jarkko Sakkinen , "Ted Ts'o" , "Andrew G. Morgan" , Linux API , Mimi Zohar , Michael Kerrisk , Austin S Hemmelgarn , linux-security-module , Aaron Jones , Serge Hallyn , LKML , Markku Savela , Kees Cook , Jonathan Corbet , Christoph Lameter , Andy Lutomirski Subject: Re: [PATCH v2 2/2] capabilities: Add a securebit to disable PR_CAP_AMBIENT_RAISE Message-ID: <20150523194535.GB30563@mail.hallyn.com> References: <003b2a2d3e6ad9f4853e248d853f73448ca7b002.1431671529.git.luto@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <003b2a2d3e6ad9f4853e248d853f73448ca7b002.1431671529.git.luto@kernel.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3804 Lines: 91 On Thu, May 14, 2015 at 11:39:49PM -0700, Andy Lutomirski wrote: > Per Andrew Morgan's request, add a securebit to allow admins to > disable PR_CAP_AMBIENT_RAISE. This securebit will prevent processes > from adding capabilities to their ambient set. > > For simplicity, this disables PR_CAP_AMBIENT_RAISE entirely rather > than just disabling setting previously cleared bits. > > Requested-by: Andrew G. Morgan > Cc: Kees Cook > Cc: Christoph Lameter > Cc: Serge Hallyn > Cc: Andy Lutomirski > Cc: Jonathan Corbet > Cc: Aaron Jones > CC: Ted Ts'o > Cc: linux-security-module@vger.kernel.org > Cc: linux-kernel@vger.kernel.org > Cc: linux-api@vger.kernel.org > Cc: akpm@linuxfoundation.org > Cc: Andrew G. Morgan > Cc: Mimi Zohar > Cc: Austin S Hemmelgarn > Cc: Markku Savela > Cc: Jarkko Sakkinen > Cc: Michael Kerrisk > Signed-off-by: Andy Lutomirski Interesting - at first I thought this wouldn't please Andrew as he'd want the inverse, but I guess this way keeps the pure-capabilities mode (with SECURE_ALL_BITS set) ambient-free which I suppose is really the important thing. Acked-by: Serge Hallyn > --- > include/uapi/linux/securebits.h | 11 ++++++++++- > security/commoncap.c | 3 ++- > 2 files changed, 12 insertions(+), 2 deletions(-) > > diff --git a/include/uapi/linux/securebits.h b/include/uapi/linux/securebits.h > index 985aac9e6bf8..35ac35cef217 100644 > --- a/include/uapi/linux/securebits.h > +++ b/include/uapi/linux/securebits.h > @@ -43,9 +43,18 @@ > #define SECBIT_KEEP_CAPS (issecure_mask(SECURE_KEEP_CAPS)) > #define SECBIT_KEEP_CAPS_LOCKED (issecure_mask(SECURE_KEEP_CAPS_LOCKED)) > > +/* When set, a process cannot add new capabilities to its ambient set. */ > +#define SECURE_NO_CAP_AMBIENT_RAISE 6 > +#define SECURE_NO_CAP_AMBIENT_RAISE_LOCKED 7 /* make bit-6 immutable */ > + > +#define SECBIT_NO_CAP_AMBIENT_RAISE (issecure_mask(SECURE_NO_CAP_AMBIENT_RAISE)) > +#define SECBIT_NO_CAP_AMBIENT_RAISE_LOCKED \ > + (issecure_mask(SECURE_NO_CAP_AMBIENT_RAISE_LOCKED)) > + > #define SECURE_ALL_BITS (issecure_mask(SECURE_NOROOT) | \ > issecure_mask(SECURE_NO_SETUID_FIXUP) | \ > - issecure_mask(SECURE_KEEP_CAPS)) > + issecure_mask(SECURE_KEEP_CAPS) | \ > + issecure_mask(SECURE_NO_CAP_AMBIENT_RAISE)) > #define SECURE_ALL_LOCKS (SECURE_ALL_BITS << 1) > > #endif /* _UAPI_LINUX_SECUREBITS_H */ > diff --git a/security/commoncap.c b/security/commoncap.c > index 09541a6a85a0..98aa1b129c12 100644 > --- a/security/commoncap.c > +++ b/security/commoncap.c > @@ -983,7 +983,8 @@ int cap_task_prctl(int option, unsigned long arg2, unsigned long arg3, > if (arg2 == PR_CAP_AMBIENT_RAISE && > (!cap_raised(current_cred()->cap_permitted, arg3) || > !cap_raised(current_cred()->cap_inheritable, > - arg3))) > + arg3) || > + issecure(SECURE_NO_CAP_AMBIENT_RAISE))) > return -EPERM; > > new = prepare_creds(); > -- > 2.1.0 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/