diff mbox series

[29/90] NET: Remove scaffolding on new secmarks

Message ID	20190419004617.64627-30-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 29/90] NET: Remove scaffolding on new secmarks Date: Thu, 18 Apr 2019 17:45:16 -0700 Message-Id: <20190419004617.64627-30-casey@schaufler-ca.com> In-Reply-To: <20190419004617.64627-1-casey@schaufler-ca.com> References: <20190419004617.64627-1-casey@schaufler-ca.com> Sender: selinux-owner@vger.kernel.org Precedence: bulk
Series	LSM: Module stacking for all \| expand [00/90] LSM: Module stacking for all [01/90] LSM: Infrastructure management of the superblock [02/90] LSM: Infrastructure management of the sock security [03/90] LSM: Infrastructure management of the key security blob [04/90] LSM: Create an lsm_export data structure. [05/90] LSM: Use lsm_export in the inode_getsecid hooks [06/90] LSM: Use lsm_export in the cred_getsecid hooks [07/90] LSM: Use lsm_export in the ipc_getsecid and task_getsecid hooks [08/90] LSM: Use lsm_export in the kernel_ask_as hooks [09/90] LSM: Use lsm_export in the getpeersec_dgram hooks [10/90] LSM: Use lsm_export in the audit_rule_match hooks [11/90] LSM: Fix logical operation in lsm_export checks [12/90] LSM: Use lsm_export in the secid_to_secctx hooks [13/90] LSM: Use lsm_export in the secctx_to_secid hooks [14/90] LSM: Use lsm_export in security_audit_rule_match [15/90] LSM: Use lsm_export in security_kernel_act_as [16/90] LSM: Use lsm_export in security_socket_getpeersec_dgram [17/90] LSM: Use lsm_export in security_secctx_to_secid [18/90] LSM: Use lsm_export in security_secid_to_secctx [19/90] LSM: Use lsm_export in security_ipc_getsecid [20/90] LSM: Use lsm_export in security_task_getsecid [21/90] LSM: Use lsm_export in security_inode_getsecid [22/90] LSM: Use lsm_export in security_cred_getsecid [23/90] Audit: Change audit_sig_sid to audit_sig_lsm [24/90] Audit: Convert target_sid to an lsm_export structure [25/90] Audit: Convert osid to an lsm_export structure [26/90] IMA: Clean out lsm_export scaffolding [27/90] NET: Change the UNIXCB from a secid to an lsm_export [28/90] NET: Remove scaffolding on secmarks [29/90] NET: Remove scaffolding on new secmarks [30/90] NET: Remove netfilter scaffolding for lsm_export [31/90] Netlabel: Replace secids with lsm_export [32/90] LSM: Remove lsm_export scaffolding functions [33/90] IMA: FIXUP prototype using lsm_export [34/90] Smack: Restore the release_secctx hook [35/90] AppArmor: Remove unnecessary hook stub [36/90] LSM: Limit calls to certain module hooks [37/90] LSM: Create a data structure for a security context [38/90] LSM: Use lsm_context in secid_to_secctx hooks [39/90] LSM: Use lsm_context in secctx_to_secid hooks [40/90] LSM: Use lsm_context in inode_getsecctx hooks [41/90] LSM: Use lsm_context in inode_notifysecctx hooks [42/90] LSM: Use lsm_context in dentry_init_security hooks [43/90] LSM: Use lsm_context in security_dentry_init_security [44/90] LSM: Use lsm_context in security_inode_notifysecctx [45/90] LSM: Use lsm_context in security_inode_getsecctx [46/90] LSM: Use lsm_context in security_secctx_to_secid [47/90] LSM: Use lsm_context in release_secctx hooks [48/90] LSM: Use lsm_context in security_release_secctx [49/90] LSM: Use lsm_context in security_secid_to_secctx [50/90] fs: remove lsm_context scaffolding [51/90] LSM: Add the release function to the lsm_context [52/90] LSM: Use lsm_context in inode_setsecctx hooks [53/90] LSM: Use lsm_context in security_inode_setsecctx [54/90] kernfs: remove lsm_context scaffolding [55/90] LSM: Remove unused macro [56/90] LSM: Special handling for secctx lsm hooks [57/90] SELinux: Use blob offset in current_sid [58/90] LSM: Specify which LSM to display [59/90] AppArmor: Remove the exclusive flag [60/90] LSM: Add secmark_relabel_packet to the set of one call hooks [61/90] LSM: Make getting the secmark right cleaner [62/90] netfilter: Fix memory leak introduced with lsm_context [63/90] Smack: Consolidate secmark conversions [64/90] netfilter: Remove unnecessary NULL check in lsm_context [65/90] LSM: Add secmark refcounting to call_one list [66/90] LSM: refactor security_setprocattr [67/90] Smack: Detect if secmarks can be safely used [68/90] LSM: Support multiple LSMs using inode_init_security [69/90] LSM: Use full security context in security_inode_setsecctx [70/90] LSM: Correct handling of ENOSYS in inode_setxattr [71/90] LSM: Infrastructure security blobs for mount options [72/90] LSM: Fix for security_init_inode_security [73/90] Smack: Advertise the secid to netlabel [74/90] LSM: Change error detection for UDP peer security [75/90] Smack: Fix setting of the CIPSO MLS_CAT flags [76/90] Smack: Set netlabel flags properly on new label import [77/90] Netlabel: Add a secattr comparison API function [78/90] Smack: Let netlabel do the work on the ambient domain [79/90] Smack: Don't set the socket label on each send [80/90] Smack: Let netlabel do the work on connections [81/90] Netlabel: Return the labeling type on socket

Commit Message

Casey Schaufler April 19, 2019, 12:45 a.m. UTC

Replace the lsm_export scaffolding in nft_meta.

Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
---
 net/netfilter/nft_meta.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/net/netfilter/nft_meta.c b/net/netfilter/nft_meta.c
index 598bea8e4799..a1d3dab5bc25 100644
--- a/net/netfilter/nft_meta.c
+++ b/net/netfilter/nft_meta.c
@@ -580,11 +580,17 @@  static int nft_secmark_compute_secid(struct nft_secmark *priv)
 	u32 tmp_secid = 0;
 	int err;
 
+	lsm_export_init(&le);
 	err = security_secctx_to_secid(priv->ctx, strlen(priv->ctx), &le);
 	if (err)
 		return err;
 
-	lsm_export_secid(&le, &tmp_secid);
+	/* Use the "best" secid */
+	if (le.selinux)
+		tmp_secid = le.selinux;
+	else
+		tmp_secid = le.smack;
+
 	if (!tmp_secid)
 		return -ENOENT;