[15/59] LSM: Use lsm_export in security_kernel_act_as

Message ID	20190409213946.1667-16-casey@schaufler-ca.com (mailing list archive)
State	Not Applicable
Headers	show Return-Path: <selinux-owner@kernel.org> From: Casey Schaufler <casey@schaufler-ca.com> To: casey.schaufler@intel.com, jmorris@namei.org, linux-security-module@vger.kernel.org, selinux@vger.kernel.org Cc: casey@schaufler-ca.com Subject: [PATCH 15/59] LSM: Use lsm_export in security_kernel_act_as Date: Tue, 9 Apr 2019 14:39:02 -0700 Message-Id: <20190409213946.1667-16-casey@schaufler-ca.com> In-Reply-To: <20190409213946.1667-1-casey@schaufler-ca.com> References: <20190409213946.1667-1-casey@schaufler-ca.com> Sender: selinux-owner@vger.kernel.org Precedence: bulk
Series	LSM: Module stacking for AppArmor \| expand [00/59] LSM: Module stacking for AppArmor [01/59] LSM: Infrastructure management of the superblock [02/59] LSM: Infrastructure management of the sock security [03/59] LSM: Infrastructure management of the key security blob [04/59] LSM: Create an lsm_export data structure. [05/59] LSM: Use lsm_export in the inode_getsecid hooks [06/59] LSM: Use lsm_export in the cred_getsecid hooks [07/59] LSM: Use lsm_export in the ipc_getsecid and task_getsecid hooks [08/59] LSM: Use lsm_export in the kernel_ask_as hooks [09/59] LSM: Use lsm_export in the getpeersec_dgram hooks [10/59] LSM: Use lsm_export in the audit_rule_match hooks [11/59] LSM: Fix logical operation in lsm_export checks [12/59] LSM: Use lsm_export in the secid_to_secctx hooks [13/59] LSM: Use lsm_export in the secctx_to_secid hooks [14/59] LSM: Use lsm_export in security_audit_rule_match [15/59] LSM: Use lsm_export in security_kernel_act_as [16/59] LSM: Use lsm_export in security_socket_getpeersec_dgram [17/59] LSM: Use lsm_export in security_secctx_to_secid [18/59] LSM: Use lsm_export in security_secid_to_secctx [19/59] LSM: Use lsm_export in security_ipc_getsecid [20/59] LSM: Use lsm_export in security_task_getsecid [21/59] LSM: Use lsm_export in security_inode_getsecid [22/59] LSM: Use lsm_export in security_cred_getsecid [23/59] Audit: Change audit_sig_sid to audit_sig_lsm [24/59] Audit: Convert target_sid to an lsm_export structure [25/59] Audit: Convert osid to an lsm_export structure [26/59] IMA: Clean out lsm_export scaffolding [27/59] NET: Store LSM access information in the socket blob for UDS [28/59] NET: Remove scaffolding on secmarks [29/59] NET: Remove scaffolding on new secmarks [30/59] NET: Remove netfilter scaffolding for lsm_export [31/59] Netlabel: Replace secids with lsm_export [32/59] LSM: Remove lsm_export scaffolding functions [33/59] IMA: FIXUP prototype using lsm_export [34/59] Smack: Restore the release_secctx hook [35/59] AppArmor: Remove unnecessary hook stub [36/59] LSM: Limit calls to certain module hooks [37/59] LSM: Create a data structure for a security context [38/59] LSM: Use lsm_context in secid_to_secctx hooks [39/59] LSM: Use lsm_context in secctx_to_secid hooks [40/59] LSM: Use lsm_context in inode_getsecctx hooks [41/59] LSM: Use lsm_context in inode_notifysecctx hooks [42/59] LSM: Use lsm_context in dentry_init_security hooks [43/59] LSM: Use lsm_context in security_dentry_init_security [44/59] LSM: Use lsm_context in security_inode_notifysecctx [45/59] LSM: Use lsm_context in security_inode_getsecctx [46/59] LSM: Use lsm_context in security_secctx_to_secid [47/59] LSM: Use lsm_context in release_secctx hooks [48/59] LSM: Use lsm_context in security_release_secctx [49/59] LSM: Use lsm_context in security_secid_to_secctx [50/59] fs: remove lsm_context scaffolding [51/59] LSM: Add the release function to the lsm_context [52/59] LSM: Use lsm_context in inode_setsecctx hooks [53/59] LSM: Use lsm_context in security_inode_setsecctx [54/59] kernfs: remove lsm_context scaffolding [55/59] LSM: Remove unused macro [56/59] LSM: Special handling for secctx lsm hooks [57/59] SELinux: Use blob offset in current_sid [58/59] LSM: Specify which LSM to display with /proc/self/attr/display [59/59] AppArmor: Remove the exclusive flag

Message ID

20190409213946.1667-16-casey@schaufler-ca.com (mailing list archive)

State

Not Applicable

Headers

From: Casey Schaufler <casey@schaufler-ca.com>
To: casey.schaufler@intel.com, jmorris@namei.org,
        linux-security-module@vger.kernel.org, selinux@vger.kernel.org
Cc: casey@schaufler-ca.com
Subject: [PATCH 15/59] LSM: Use lsm_export in security_kernel_act_as
Date: Tue,  9 Apr 2019 14:39:02 -0700
Message-Id: <20190409213946.1667-16-casey@schaufler-ca.com>
In-Reply-To: <20190409213946.1667-1-casey@schaufler-ca.com>
References: <20190409213946.1667-1-casey@schaufler-ca.com>
Sender: selinux-owner@vger.kernel.org
Precedence: bulk

Series

LSM: Module stacking for AppArmor | expand

Commit Message

Casey Schaufler April 9, 2019, 9:39 p.m. UTC

From: Casey Schaufler <cschaufler@schaufler-ca.com>

Convert security_kernel_act_as to use the lsm_export structure
instead of a u32 secid. There is some scaffolding involved
that will be removed when the related data is updated.

Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
---
 include/linux/cred.h     |  3 ++-
 include/linux/security.h |  5 +++--
 kernel/cred.c            | 10 ++++++----
 security/security.c      |  8 ++------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/include/linux/cred.h b/include/linux/cred.h
index ddd45bb74887..023f422eefd6 100644
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
@@ -22,6 +22,7 @@ 
 
 struct cred;
 struct inode;
+struct lsm_export;
 
 /*
  * COW Supplementary groups list
@@ -165,7 +166,7 @@  extern const struct cred *override_creds(const struct cred *);
 extern void revert_creds(const struct cred *);
 extern struct cred *prepare_kernel_cred(struct task_struct *);
 extern int change_create_files_as(struct cred *, struct inode *);
-extern int set_security_override(struct cred *, u32);
+extern int set_security_override(struct cred *, struct lsm_export *);
 extern int set_security_override_from_ctx(struct cred *, const char *);
 extern int set_create_files_as(struct cred *, struct inode *);
 extern int cred_fscmp(const struct cred *, const struct cred *);
diff --git a/include/linux/security.h b/include/linux/security.h
index ea2c6c4e88db..7369cdc3a681 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -378,7 +378,7 @@  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_act_as(struct cred *new, struct lsm_export *l);
 int security_kernel_create_files_as(struct cred *new, struct inode *inode);
 int security_kernel_module_request(char *kmod_name);
 int security_kernel_load_data(enum kernel_load_data_id id);
@@ -961,7 +961,8 @@  static inline void security_transfer_creds(struct cred *new,
 {
 }
 
-static inline int security_kernel_act_as(struct cred *cred, u32 secid)
+static inline int security_kernel_act_as(struct cred *cred,
+					 struct lsm_export *l)
 {
 	return 0;
 }
diff --git a/kernel/cred.c b/kernel/cred.c
index 45d77284aed0..40a3fde22667 100644
--- a/kernel/cred.c
+++ b/kernel/cred.c
@@ -701,14 +701,14 @@  EXPORT_SYMBOL(prepare_kernel_cred);
 /**
  * set_security_override - Set the security ID in a set of credentials
  * @new: The credentials to alter
- * @secid: The LSM security ID to set
+ * @l: The LSM security information to set
  *
  * Set the LSM security ID in a set of credentials so that the subjective
  * security is overridden when an alternative set of credentials is used.
  */
-int set_security_override(struct cred *new, u32 secid)
+int set_security_override(struct cred *new, struct lsm_export *l)
 {
-	return security_kernel_act_as(new, secid);
+	return security_kernel_act_as(new, l);
 }
 EXPORT_SYMBOL(set_security_override);
 
@@ -724,6 +724,7 @@  EXPORT_SYMBOL(set_security_override);
  */
 int set_security_override_from_ctx(struct cred *new, const char *secctx)
 {
+	struct lsm_export le;
 	u32 secid;
 	int ret;
 
@@ -731,7 +732,8 @@  int set_security_override_from_ctx(struct cred *new, const char *secctx)
 	if (ret < 0)
 		return ret;
 
-	return set_security_override(new, secid);
+	lsm_export_to_all(&le, secid);
+	return set_security_override(new, &le);
 }
 EXPORT_SYMBOL(set_security_override_from_ctx);
 
diff --git a/security/security.c b/security/security.c
index 1e819ecf26ff..edaaaef54239 100644
--- a/security/security.c
+++ b/security/security.c
@@ -1615,13 +1615,9 @@  void security_cred_getsecid(const struct cred *c, u32 *secid)
 }
 EXPORT_SYMBOL(security_cred_getsecid);
 
-int security_kernel_act_as(struct cred *new, u32 secid)
+int security_kernel_act_as(struct cred *new, struct lsm_export *l)
 {
-	struct lsm_export data = { .flags = LSM_EXPORT_NONE };
-
-	lsm_export_to_all(&data, secid);
-
-	return call_int_hook(kernel_act_as, 0, new, &data);
+	return call_int_hook(kernel_act_as, 0, new, l);
 }
 
 int security_kernel_create_files_as(struct cred *new, struct inode *inode)

[15/59] LSM: Use lsm_export in security_kernel_act_as

Commit Message

Patch