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: john.johansen@canonical.com, linux-kernel@vger.kernel.org,
linux-audit@redhat.com
Subject: [PATCH v34 29/29] AppArmor: Remove the exclusive flag
Date: Thu, 7 Apr 2022 14:22:30 -0700 [thread overview]
Message-ID: <20220407212230.12893-30-casey@schaufler-ca.com> (raw)
In-Reply-To: <20220407212230.12893-1-casey@schaufler-ca.com>
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 <stephen.smalley.work@gmail.com>
Acked-by: John Johansen <john.johansen@canonical.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
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 1ee58c1491ab..388298a15556 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -1145,22 +1145,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
@@ -1264,8 +1248,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),
@@ -1919,7 +1901,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.35.1
--
Linux-audit mailing list
Linux-audit@redhat.com
https://listman.redhat.com/mailman/listinfo/linux-audit
next prev parent reply other threads:[~2022-04-07 21:38 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20220407212230.12893-1-casey.ref@schaufler-ca.com>
2022-04-07 21:22 ` [PATCH v34 00/29] LSM: Module stacking for AppArmor Casey Schaufler
2022-04-07 21:22 ` [PATCH v34 01/29] integrity: disassociate ima_filter_rule from security_audit_rule Casey Schaufler
2022-04-07 21:22 ` [PATCH v34 02/29] LSM: Infrastructure management of the sock security Casey Schaufler
2022-04-07 21:22 ` [PATCH v34 03/29] LSM: Add the lsmblob data structure Casey Schaufler
2022-04-07 21:22 ` [PATCH v34 04/29] LSM: provide lsm name and id slot mappings Casey Schaufler
2022-04-07 21:22 ` [PATCH v34 05/29] IMA: avoid label collisions with stacked LSMs Casey Schaufler
2022-04-07 21:22 ` [PATCH v34 06/29] LSM: Use lsmblob in security_audit_rule_match Casey Schaufler
2022-04-07 21:22 ` [PATCH v34 07/29] LSM: Use lsmblob in security_kernel_act_as Casey Schaufler
2022-04-07 21:22 ` [PATCH v34 08/29] LSM: Use lsmblob in security_secctx_to_secid Casey Schaufler
2022-04-07 21:22 ` [PATCH v34 09/29] LSM: Use lsmblob in security_secid_to_secctx Casey Schaufler
2022-04-07 21:22 ` [PATCH v34 10/29] LSM: Use lsmblob in security_ipc_getsecid Casey Schaufler
2022-04-07 21:22 ` [PATCH v34 11/29] LSM: Use lsmblob in security_current_getsecid Casey Schaufler
2022-04-08 3:43 ` kernel test robot
2022-04-08 4:44 ` kernel test robot
2022-04-17 9:33 ` [LSM] 0d4df6ae86: BUG:KASAN:stack-out-of-bounds_in_netlbl_unlabel_defconf kernel test robot
2022-04-07 21:22 ` [PATCH v34 12/29] LSM: Use lsmblob in security_inode_getsecid Casey Schaufler
2022-04-07 21:22 ` [PATCH v34 13/29] LSM: Use lsmblob in security_cred_getsecid Casey Schaufler
2022-04-08 5:46 ` kernel test robot
2022-04-07 21:22 ` [PATCH v34 14/29] LSM: Specify which LSM to display Casey Schaufler
2022-04-07 21:22 ` [PATCH v34 15/29] LSM: Ensure the correct LSM context releaser Casey Schaufler
2022-04-07 21:22 ` [PATCH v34 16/29] LSM: Use lsmcontext in security_secid_to_secctx Casey Schaufler
2022-04-07 21:22 ` [PATCH v34 17/29] LSM: Use lsmcontext in security_inode_getsecctx Casey Schaufler
2022-04-07 21:22 ` [PATCH v34 18/29] LSM: security_secid_to_secctx in netlink netfilter Casey Schaufler
2022-04-07 21:22 ` [PATCH v34 19/29] NET: Store LSM netlabel data in a lsmblob Casey Schaufler
2022-04-07 21:22 ` [PATCH v34 20/29] binder: Pass LSM identifier for confirmation Casey Schaufler
2022-04-07 21:22 ` [PATCH v34 21/29] LSM: Extend security_secid_to_secctx to include module selection Casey Schaufler
2022-04-07 21:22 ` [PATCH v34 22/29] Audit: Keep multiple LSM data in audit_names Casey Schaufler
2022-04-07 21:22 ` [PATCH v34 23/29] Audit: Create audit_stamp structure Casey Schaufler
2022-04-07 21:22 ` [PATCH v34 24/29] LSM: Add a function to report multiple LSMs Casey Schaufler
2022-04-07 21:22 ` [PATCH v34 25/29] Audit: Allow multiple records in an audit_buffer Casey Schaufler
2022-04-07 21:22 ` [PATCH v34 26/29] Audit: Add record for multiple task security contexts Casey Schaufler
2022-04-07 21:22 ` [PATCH v34 27/29] Audit: Add record for multiple object contexts Casey Schaufler
2022-04-07 21:22 ` [PATCH v34 28/29] LSM: Add /proc attr entry for full LSM context Casey Schaufler
2022-04-07 21:22 ` Casey Schaufler [this message]
2022-04-15 21:17 [PATCH v34 00/29] LSM: Module stacking for AppArmor Casey Schaufler
2022-04-15 21:18 ` [PATCH v34 29/29] AppArmor: Remove the exclusive flag Casey Schaufler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220407212230.12893-30-casey@schaufler-ca.com \
--to=casey@schaufler-ca.com \
--cc=casey.schaufler@intel.com \
--cc=jmorris@namei.org \
--cc=john.johansen@canonical.com \
--cc=linux-audit@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=selinux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).