From patchwork Fri Jan 5 21:15:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Garrett X-Patchwork-Id: 10147085 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7F4CD60134 for ; Fri, 5 Jan 2018 21:15:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0347D28931 for ; Fri, 5 Jan 2018 21:15:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EC42F28936; Fri, 5 Jan 2018 21:15:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AEE5628935 for ; Fri, 5 Jan 2018 21:15:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752862AbeAEVPp (ORCPT ); Fri, 5 Jan 2018 16:15:45 -0500 Received: from mail-ot0-f202.google.com ([74.125.82.202]:55029 "EHLO mail-ot0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752247AbeAEVPo (ORCPT ); Fri, 5 Jan 2018 16:15:44 -0500 Received: by mail-ot0-f202.google.com with SMTP id t20so2920069ote.21 for ; Fri, 05 Jan 2018 13:15:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:date:message-id:subject:from:to:cc; bh=71HgBaqTKJtnIXGnIO2QmqbwN1Lj/QQqd08w/uYTqn8=; b=Ae47nTUwbh+7mrjg8EGWDKKpZvxPVRedgUvG4Z0f3KGlRdGNK2gS5x9jZVGe9cVai+ nWC7ygmGyOI4hJyoGNu9fXSUqoe08MzWbRiiBhgB5xagVv+QajB5z8F1sihej8FAHmB8 ANScek82lQAGD0ruw7xZJDgCk9Zb3JFkL8WHE0GIeeKSmlFTcDjrmnnbELuzx5cGEKID NeiRH0j1PuTEWx6dGC+IIg7RpBE6PwZSAyK+pEKGxHer7fdpMfVxYvWHA3wZyu/YN4UY ur8YQj0TbpYeQqIFGToDkPWKSvm++FXASxDy1D8NnQqD3SrcLt17/dbFltGjjn+iX4q3 5Xfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:date:message-id:subject:from:to:cc; bh=71HgBaqTKJtnIXGnIO2QmqbwN1Lj/QQqd08w/uYTqn8=; b=SZrxJ/J1BT6rVuTWpLc6T7np5oRO3PMgkT8MMYwp5Is2KXmaCorWpCqJ+CF9w0PtOs Vj368QDXKGulsZuaEZ1tYPgFLbpsv2HsC2EunY0oQfD6DsQ5OPGfEXUSdgo3yjbVEURr T4kQ2CxNA7Ver7VV4NqWmsjGiMfa2yVFzKVFaT/Wn5AHemaVJU6TAcXVgjQ6vS9vUXwR aQo02LXCg7c34WCoVBR9WDqu2ECBu7Pd23G/XMwtJfFLYvAKKhyibZU2DCTQMfJoqqeW W8kkglq7Kq8MQxAnTH/FJBvkgbE+NELPvzcmz2hO6bpChGaYQHFZXsfE/4iXtwrgH47X wSQQ== X-Gm-Message-State: AKwxyteO5IzTCyA4zPgtvEy0e5Xp27IEQCE0aCal3+bO5fKvK9CEgViu 3MNiIVDi1wO7vZ6FaHqSoiCz/FD4pb4Tu+WLVu9uYg== X-Google-Smtp-Source: ACJfBovO35+1nmfcUInn2bfXOT+BRFJRUyan4es9jLHfDYd71yjSVPGRN6Ew3agXzntiPiVR4FKNusMw0tRc9N7/yLMfnQ== MIME-Version: 1.0 X-Received: by 10.157.68.193 with SMTP id p1mr2215747otg.108.1515186943958; Fri, 05 Jan 2018 13:15:43 -0800 (PST) Date: Fri, 5 Jan 2018 13:15:35 -0800 Message-Id: <20180105211536.11611-1-mjg59@google.com> X-Mailer: git-send-email 2.16.0.rc0.223.g4a4ac83678-goog Subject: [PATCH V5 1/2] security: Add a cred_getsecid hook From: Matthew Garrett To: linux-integrity@vger.kernel.org Cc: Matthew Garrett , Paul Moore , Stephen Smalley , Eric Paris , selinux@tycho.nsa.gov, Casey Schaufler , linux-security-module@vger.kernel.org, Mimi Zohar , Dmitry Kasatkin Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: X-Virus-Scanned: ClamAV using ClamSMTP For IMA purposes, we want to be able to obtain the prepared secid in the bprm structure before the credentials are committed. Add a cred_getsecid hook that makes this possible. Signed-off-by: Matthew Garrett Acked-by: Paul Moore Cc: Paul Moore Cc: Stephen Smalley Cc: Eric Paris Cc: selinux@tycho.nsa.gov Cc: Casey Schaufler Cc: linux-security-module@vger.kernel.org Cc: Mimi Zohar Cc: Dmitry Kasatkin Cc: linux-integrity@vger.kernel.org --- Ok, I'm taking a slightly different approach and just passing in the secid - for everything other than the CREDS_CHECK case this will be the task secid, for CREDS_CHECK it'll be the one associated with the BPRM structure. I believe that this results in zero functional change other than when dealing with the new functionality, and we can come back and rework this once we have a better idea about how IMA should be using secids in the first place. include/linux/lsm_hooks.h | 6 ++++++ include/linux/security.h | 1 + security/security.c | 7 +++++++ security/selinux/hooks.c | 6 ++++++ security/smack/smack_lsm.c | 18 ++++++++++++++++++ 5 files changed, 38 insertions(+) diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h index 7161d8e7ee79..72932dabbaed 100644 --- a/include/linux/lsm_hooks.h +++ b/include/linux/lsm_hooks.h @@ -554,6 +554,10 @@ * @new points to the new credentials. * @old points to the original credentials. * Transfer data from original creds to new creds + * @cred_getsecid: + * Retrieve the security identifier of the cred structure @c + * @c contains the credentials, secid will be placed into @secid. + * In case of failure, @secid will be set to zero. * @kernel_act_as: * Set the credentials for a kernel service to act as (subjective context). * @new points to the credentials to be modified. @@ -1541,6 +1545,7 @@ union security_list_options { int (*cred_prepare)(struct cred *new, const struct cred *old, gfp_t gfp); void (*cred_transfer)(struct cred *new, const struct cred *old); + void (*cred_getsecid)(const struct cred *c, u32 *secid); int (*kernel_act_as)(struct cred *new, u32 secid); int (*kernel_create_files_as)(struct cred *new, struct inode *inode); int (*kernel_module_request)(char *kmod_name); @@ -1824,6 +1829,7 @@ struct security_hook_heads { struct list_head cred_free; struct list_head cred_prepare; struct list_head cred_transfer; + struct list_head cred_getsecid; struct list_head kernel_act_as; struct list_head kernel_create_files_as; struct list_head kernel_read_file; diff --git a/include/linux/security.h b/include/linux/security.h index 73f1ef625d40..5cfff15ac378 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -324,6 +324,7 @@ int security_cred_alloc_blank(struct cred *cred, gfp_t gfp); void security_cred_free(struct cred *cred); int security_prepare_creds(struct cred *new, const struct cred *old, gfp_t gfp); void security_transfer_creds(struct cred *new, const struct cred *old); +void security_cred_getsecid(const struct cred *c, u32 *secid); int security_kernel_act_as(struct cred *new, u32 secid); int security_kernel_create_files_as(struct cred *new, struct inode *inode); int security_kernel_module_request(char *kmod_name); diff --git a/security/security.c b/security/security.c index 1cd8526cb0b7..35cbd75844c2 100644 --- a/security/security.c +++ b/security/security.c @@ -1005,6 +1005,13 @@ void security_transfer_creds(struct cred *new, const struct cred *old) call_void_hook(cred_transfer, new, old); } +void security_cred_getsecid(const struct cred *c, u32 *secid) +{ + *secid = 0; + call_void_hook(cred_getsecid, c, secid); +} +EXPORT_SYMBOL(security_cred_getsecid); + int security_kernel_act_as(struct cred *new, u32 secid) { return call_int_hook(kernel_act_as, 0, new, secid); diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 8644d864e3c1..d3009c027de8 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -3844,6 +3844,11 @@ static void selinux_cred_transfer(struct cred *new, const struct cred *old) *tsec = *old_tsec; } +static void selinux_cred_getsecid(const struct cred *c, u32 *secid) +{ + *secid = cred_sid(c); +} + /* * set the security data for a kernel service * - all the creation contexts are set to unlabelled @@ -6479,6 +6484,7 @@ static struct security_hook_list selinux_hooks[] __lsm_ro_after_init = { LSM_HOOK_INIT(cred_free, selinux_cred_free), LSM_HOOK_INIT(cred_prepare, selinux_cred_prepare), LSM_HOOK_INIT(cred_transfer, selinux_cred_transfer), + LSM_HOOK_INIT(cred_getsecid, selinux_cred_getsecid), LSM_HOOK_INIT(kernel_act_as, selinux_kernel_act_as), LSM_HOOK_INIT(kernel_create_files_as, selinux_kernel_create_files_as), LSM_HOOK_INIT(kernel_module_request, selinux_kernel_module_request), diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index 14cc7940b36d..b27327ebb031 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c @@ -2049,6 +2049,23 @@ static void smack_cred_transfer(struct cred *new, const struct cred *old) /* cbs copy rule list */ } +/** + * smack_cred_getsecid - get the secid corresponding to a creds structure + * @c: the object creds + * @secid: where to put the result + * + * Sets the secid to contain a u32 version of the smack label. + */ +static void smack_cred_getsecid(const struct cred *c, u32 *secid) +{ + struct smack_known *skp; + + rcu_read_lock(); + skp = smk_of_task(c->security); + *secid = skp->smk_secid; + rcu_read_unlock(); +} + /** * smack_kernel_act_as - Set the subjective context in a set of credentials * @new: points to the set of credentials to be modified. @@ -4727,6 +4744,7 @@ static struct security_hook_list smack_hooks[] __lsm_ro_after_init = { LSM_HOOK_INIT(cred_free, smack_cred_free), LSM_HOOK_INIT(cred_prepare, smack_cred_prepare), LSM_HOOK_INIT(cred_transfer, smack_cred_transfer), + LSM_HOOK_INIT(cred_getsecid, smack_cred_getsecid), LSM_HOOK_INIT(kernel_act_as, smack_kernel_act_as), LSM_HOOK_INIT(kernel_create_files_as, smack_kernel_create_files_as), LSM_HOOK_INIT(task_setpgid, smack_task_setpgid),