(off-list ancestor, not in this archive)
[PATCH v28 00/25] LSM: Module stacking for AppArmor · Casey Schaufler <casey@schaufler-ca.com> · 2021-07-22
[PATCH v28 01/25] LSM: Infrastructure management of the sock security · Casey Schaufler <casey@schaufler-ca.com> · 2021-07-22
[PATCH v28 02/25] LSM: Add the lsmblob data structure. · Casey Schaufler <casey@schaufler-ca.com> · 2021-07-22
[PATCH v28 03/25] LSM: provide lsm name and id slot mappings · Casey Schaufler <casey@schaufler-ca.com> · 2021-07-22
[PATCH v28 04/25] IMA: avoid label collisions with stacked LSMs · Casey Schaufler <casey@schaufler-ca.com> · 2021-07-22
[PATCH v28 05/25] LSM: Use lsmblob in security_audit_rule_match · Casey Schaufler <casey@schaufler-ca.com> · 2021-07-22
[PATCH v28 06/25] LSM: Use lsmblob in security_kernel_act_as · Casey Schaufler <casey@schaufler-ca.com> · 2021-07-22
[PATCH v28 07/25] LSM: Use lsmblob in security_secctx_to_secid · Casey Schaufler <casey@schaufler-ca.com> · 2021-07-22
[PATCH v28 08/25] LSM: Use lsmblob in security_secid_to_secctx · Casey Schaufler <casey@schaufler-ca.com> · 2021-07-22
[PATCH v28 09/25] LSM: Use lsmblob in security_ipc_getsecid · Casey Schaufler <casey@schaufler-ca.com> · 2021-07-22
[PATCH v28 10/25] LSM: Use lsmblob in security_task_getsecid · Casey Schaufler <casey@schaufler-ca.com> · 2021-07-22
[PATCH v28 11/25] LSM: Use lsmblob in security_inode_getsecid · Casey Schaufler <casey@schaufler-ca.com> · 2021-07-22
[PATCH v28 12/25] LSM: Use lsmblob in security_cred_getsecid · Casey Schaufler <casey@schaufler-ca.com> · 2021-07-22
Re: [PATCH v28 12/25] LSM: Use lsmblob in security_cred_getsecid · kernel test robot <hidden> · 2021-07-23
[PATCH v28 13/25] IMA: Change internal interfaces to use lsmblobs · Casey Schaufler <casey@schaufler-ca.com> · 2021-07-22
[PATCH v28 14/25] LSM: Specify which LSM to display · Casey Schaufler <casey@schaufler-ca.com> · 2021-07-22
[PATCH v28 15/25] LSM: Ensure the correct LSM context releaser · Casey Schaufler <casey@schaufler-ca.com> · 2021-07-22
[PATCH v28 16/25] LSM: Use lsmcontext in security_secid_to_secctx · Casey Schaufler <casey@schaufler-ca.com> · 2021-07-22
[PATCH v28 17/25] LSM: Use lsmcontext in security_inode_getsecctx · Casey Schaufler <casey@schaufler-ca.com> · 2021-07-22
[PATCH v28 18/25] LSM: security_secid_to_secctx in netlink netfilter · Casey Schaufler <casey@schaufler-ca.com> · 2021-07-22
[PATCH v28 19/25] NET: Store LSM netlabel data in a lsmblob · Casey Schaufler <casey@schaufler-ca.com> · 2021-07-22
[PATCH v28 20/25] LSM: Verify LSM display sanity in binder · Casey Schaufler <casey@schaufler-ca.com> · 2021-07-22
[PATCH v28 21/25] audit: support non-syscall auxiliary records · Casey Schaufler <casey@schaufler-ca.com> · 2021-07-22
Re: [PATCH v28 21/25] audit: support non-syscall auxiliary records · kernel test robot <hidden> · 2021-07-22
[PATCH v28 22/25] Audit: Add record for multiple process LSM attributes · Casey Schaufler <casey@schaufler-ca.com> · 2021-07-22
Re: [PATCH v28 22/25] Audit: Add record for multiple process LSM attributes · Paul Moore <paul@paul-moore.com> · 2021-08-12
Re: [PATCH v28 22/25] Audit: Add record for multiple process LSM attributes · Casey Schaufler <casey@schaufler-ca.com> · 2021-08-12
Re: [PATCH v28 22/25] Audit: Add record for multiple process LSM attributes · Paul Moore <paul@paul-moore.com> · 2021-08-13
Re: [PATCH v28 22/25] Audit: Add record for multiple process LSM attributes · Casey Schaufler <casey@schaufler-ca.com> · 2021-08-13
Re: [PATCH v28 22/25] Audit: Add record for multiple process LSM attributes · Paul Moore <paul@paul-moore.com> · 2021-08-13
Re: [PATCH v28 22/25] Audit: Add record for multiple process LSM attributes · Casey Schaufler <casey@schaufler-ca.com> · 2021-08-13
Re: [PATCH v28 22/25] Audit: Add record for multiple process LSM attributes · Paul Moore <paul@paul-moore.com> · 2021-08-16
Re: [PATCH v28 22/25] Audit: Add record for multiple process LSM attributes · Casey Schaufler <casey@schaufler-ca.com> · 2021-08-18
Re: [PATCH v28 22/25] Audit: Add record for multiple process LSM attributes · Paul Moore <paul@paul-moore.com> · 2021-08-19
Re: [PATCH v28 22/25] Audit: Add record for multiple process LSM attributes · Casey Schaufler <casey@schaufler-ca.com> · 2021-08-19
Re: [PATCH v28 22/25] Audit: Add record for multiple process LSM attributes · Casey Schaufler <casey@schaufler-ca.com> · 2021-08-19
Re: [PATCH v28 22/25] Audit: Add record for multiple process LSM attributes · Paul Moore <paul@paul-moore.com> · 2021-08-20
Re: [PATCH v28 22/25] Audit: Add record for multiple process LSM attributes · Casey Schaufler <casey@schaufler-ca.com> · 2021-08-20
Re: [PATCH v28 22/25] Audit: Add record for multiple process LSM attributes · Casey Schaufler <casey@schaufler-ca.com> · 2021-08-20
Re: [PATCH v28 22/25] Audit: Add record for multiple process LSM attributes · Paul Moore <paul@paul-moore.com> · 2021-08-24
Re: [PATCH v28 22/25] Audit: Add record for multiple process LSM attributes · Casey Schaufler <casey@schaufler-ca.com> · 2021-08-24
Re: [PATCH v28 22/25] Audit: Add record for multiple process LSM attributes · Paul Moore <paul@paul-moore.com> · 2021-08-24
[PATCH v28 23/25] Audit: Add record for multiple object LSM attributes · Casey Schaufler <casey@schaufler-ca.com> · 2021-07-22
[PATCH v28 24/25] LSM: Add /proc attr entry for full LSM context · Casey Schaufler <casey@schaufler-ca.com> · 2021-07-22
[PATCH v28 25/25] AppArmor: Remove the exclusive flag · Casey Schaufler <casey@schaufler-ca.com> · 2021-07-22

[PATCH v28 25/25] AppArmor: Remove the exclusive flag

STALE1895d SUPERSEDED: 3 (1M)

From: Casey Schaufler <casey@schaufler-ca.com>
Date: 2021-07-22 01:15:59
Also in: lkml, selinux
Subsystem: apparmor security module, security subsystem, the rest · Maintainers: John Johansen, John Johansen, Georgia Garcia, Paul Moore, James Morris, "Serge E. Hallyn", Linus Torvalds

Status: Superseded by v38 (posted 2022-09-27). [go to v38]

Revision v28 (24 revisions archived); 3 review trailers (1 from subsystem maintainers).

Revisions (24)

2019-04-09 v1 re-posted 2019-04-09 go to this post re-posted 2019-04-09 go to this post re-posted 2019-05-31 go to this post re-posted 2019-06-02 go to this post
2019-06-18 v2 [diff against previous]
2019-07-26 v5 [diff against previous]
2019-08-07 v7 [diff against previous]
2019-08-29 v8 [diff against previous]
2019-10-24 v10 [diff against previous]
2019-11-27 v11 [diff against previous] re-posted 2019-11-13 go to this post
2019-12-16 v12 [diff against previous] re-posted 2019-12-24 go to this post
2019-12-25 v13 [diff against previous]
2021-01-27 v24 [diff against previous]
2021-03-09 v25 [diff against previous]
2021-05-13 v26 [diff against previous]
2021-06-11 v27 [diff against previous]
2021-07-22 v28 current [diff against previous]
2021-09-24 v29 [diff against previous]
2021-11-24 v30 [diff against previous]
2021-12-14 v31 [diff against previous]
2022-02-03 v32 [diff against previous]
2022-03-10 v33 [diff against previous]
2022-04-07 v34 [diff against previous] re-posted 2022-04-15 go to this post
2022-04-18 v35 [diff against previous]
2022-06-09 v36 [diff against previous]
2022-06-28 v37 [diff against previous]
2022-09-27 v38 [diff against previous]

With the inclusion of the interface LSM process attribute
mechanism AppArmor no longer needs to be treated as an
"exclusive" security module. Remove the flag that indicates
it is exclusive. Remove the stub getpeersec_dgram AppArmor
hook as it has no effect in the single LSM case and
interferes in the multiple LSM case.

Acked-by: Stephen Smalley <redacted>
Acked-by: John Johansen <john.johansen@canonical.com>
Reviewed-by: Kees Cook <redacted>
Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
---
 security/apparmor/lsm.c | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index 65a004597e53..15af5a5cb0c0 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c

@@ -1138,22 +1138,6 @@ static int apparmor_socket_getpeersec_stream(struct socket *sock,
 	return error;
 }
 
-/**
- * apparmor_socket_getpeersec_dgram - get security label of packet
- * @sock: the peer socket
- * @skb: packet data
- * @secid: pointer to where to put the secid of the packet
- *
- * Sets the netlabel socket state on sk from parent
- */
-static int apparmor_socket_getpeersec_dgram(struct socket *sock,
-					    struct sk_buff *skb, u32 *secid)
-
-{
-	/* TODO: requires secid support */
-	return -ENOPROTOOPT;
-}
-
 /**
  * apparmor_sock_graft - Initialize newly created socket
  * @sk: child sock

@@ -1257,8 +1241,6 @@ static struct security_hook_list apparmor_hooks[] __lsm_ro_after_init = {
 #endif
 	LSM_HOOK_INIT(socket_getpeersec_stream,
 		      apparmor_socket_getpeersec_stream),
-	LSM_HOOK_INIT(socket_getpeersec_dgram,
-		      apparmor_socket_getpeersec_dgram),
 	LSM_HOOK_INIT(sock_graft, apparmor_sock_graft),
 #ifdef CONFIG_NETWORK_SECMARK
 	LSM_HOOK_INIT(inet_conn_request, apparmor_inet_conn_request),

@@ -1928,7 +1910,7 @@ static int __init apparmor_init(void)
 
 DEFINE_LSM(apparmor) = {
 	.name = "apparmor",
-	.flags = LSM_FLAG_LEGACY_MAJOR | LSM_FLAG_EXCLUSIVE,
+	.flags = LSM_FLAG_LEGACY_MAJOR,
 	.enabled = &apparmor_enabled,
 	.blobs = &apparmor_blob_sizes,
 	.init = apparmor_init,

-- 
2.31.1