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, sds@tycho.nsa.gov
Subject: [PATCH v29 09/28] LSM: Use lsmblob in security_ipc_getsecid
Date: Fri, 24 Sep 2021 10:54:22 -0700 [thread overview]
Message-ID: <20210924175441.7943-10-casey@schaufler-ca.com> (raw)
In-Reply-To: <20210924175441.7943-1-casey@schaufler-ca.com>
There may be more than one LSM that provides IPC data
for auditing. Change security_ipc_getsecid() to fill in
a lsmblob structure instead of the u32 secid. The
audit data structure containing the secid will be updated
later, so there is a bit of scaffolding here.
Reviewed-by: Kees Cook <keescook@chromium.org>
Reviewed-by: John Johansen <john.johansen@canonical.com>
Acked-by: Stephen Smalley <stephen.smalley.work@gmail.com>
Acked-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
Cc: linux-audit@redhat.com
---
include/linux/security.h | 7 ++++---
kernel/auditsc.c | 7 ++++++-
security/security.c | 12 +++++++++---
3 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/include/linux/security.h b/include/linux/security.h
index 60f0a56f43ed..e674a6cdab46 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -519,7 +519,7 @@ int security_task_prctl(int option, unsigned long arg2, unsigned long arg3,
unsigned long arg4, unsigned long arg5);
void security_task_to_inode(struct task_struct *p, struct inode *inode);
int security_ipc_permission(struct kern_ipc_perm *ipcp, short flag);
-void security_ipc_getsecid(struct kern_ipc_perm *ipcp, u32 *secid);
+void security_ipc_getsecid(struct kern_ipc_perm *ipcp, struct lsmblob *blob);
int security_msg_msg_alloc(struct msg_msg *msg);
void security_msg_msg_free(struct msg_msg *msg);
int security_msg_queue_alloc(struct kern_ipc_perm *msq);
@@ -1276,9 +1276,10 @@ static inline int security_ipc_permission(struct kern_ipc_perm *ipcp,
return 0;
}
-static inline void security_ipc_getsecid(struct kern_ipc_perm *ipcp, u32 *secid)
+static inline void security_ipc_getsecid(struct kern_ipc_perm *ipcp,
+ struct lsmblob *blob)
{
- *secid = 0;
+ lsmblob_init(blob, 0);
}
static inline int security_msg_msg_alloc(struct msg_msg *msg)
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index df8a57c5355d..b4d214b21b97 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -2337,12 +2337,17 @@ void __audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat)
void __audit_ipc_obj(struct kern_ipc_perm *ipcp)
{
struct audit_context *context = audit_context();
+ struct lsmblob blob;
context->ipc.uid = ipcp->uid;
context->ipc.gid = ipcp->gid;
context->ipc.mode = ipcp->mode;
context->ipc.has_perm = 0;
- security_ipc_getsecid(ipcp, &context->ipc.osid);
+ security_ipc_getsecid(ipcp, &blob);
+ /* context->ipc.osid will be changed to a lsmblob later in
+ * the patch series. This will allow auditing of all the object
+ * labels associated with the ipc object. */
+ context->ipc.osid = lsmblob_value(&blob);
context->type = AUDIT_IPC;
}
diff --git a/security/security.c b/security/security.c
index 8163dc615ba6..f6760b25fed0 100644
--- a/security/security.c
+++ b/security/security.c
@@ -1995,10 +1995,16 @@ int security_ipc_permission(struct kern_ipc_perm *ipcp, short flag)
return call_int_hook(ipc_permission, 0, ipcp, flag);
}
-void security_ipc_getsecid(struct kern_ipc_perm *ipcp, u32 *secid)
+void security_ipc_getsecid(struct kern_ipc_perm *ipcp, struct lsmblob *blob)
{
- *secid = 0;
- call_void_hook(ipc_getsecid, ipcp, secid);
+ struct security_hook_list *hp;
+
+ lsmblob_init(blob, 0);
+ hlist_for_each_entry(hp, &security_hook_heads.ipc_getsecid, list) {
+ if (WARN_ON(hp->lsmid->slot < 0 || hp->lsmid->slot >= lsm_slot))
+ continue;
+ hp->hook.ipc_getsecid(ipcp, &blob->secid[hp->lsmid->slot]);
+ }
}
int security_msg_msg_alloc(struct msg_msg *msg)
--
2.31.1
--
Linux-audit mailing list
Linux-audit@redhat.com
https://listman.redhat.com/mailman/listinfo/linux-audit
next prev parent reply other threads:[~2021-09-24 18:05 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20210924175441.7943-1-casey.ref@schaufler-ca.com>
2021-09-24 17:54 ` [PATCH v29 00/28] LSM: Module stacking for AppArmor Casey Schaufler
2021-09-24 17:54 ` [PATCH v29 01/28] LSM: Infrastructure management of the sock security Casey Schaufler
2021-09-24 17:54 ` [PATCH v29 02/28] LSM: Add the lsmblob data structure Casey Schaufler
2021-09-24 17:54 ` [PATCH v29 03/28] LSM: provide lsm name and id slot mappings Casey Schaufler
2021-09-24 17:54 ` [PATCH v29 04/28] IMA: avoid label collisions with stacked LSMs Casey Schaufler
2021-09-24 17:54 ` [PATCH v29 05/28] LSM: Use lsmblob in security_audit_rule_match Casey Schaufler
2021-09-24 17:54 ` [PATCH v29 06/28] LSM: Use lsmblob in security_kernel_act_as Casey Schaufler
2021-09-24 17:54 ` [PATCH v29 07/28] LSM: Use lsmblob in security_secctx_to_secid Casey Schaufler
2021-09-24 17:54 ` [PATCH v29 08/28] LSM: Use lsmblob in security_secid_to_secctx Casey Schaufler
2021-09-24 17:54 ` Casey Schaufler [this message]
2021-09-24 17:54 ` [PATCH v29 10/28] LSM: Use lsmblob in security_task_getsecid Casey Schaufler
2021-09-24 17:54 ` [PATCH v29 11/28] LSM: Use lsmblob in security_inode_getsecid Casey Schaufler
2021-09-24 17:54 ` [PATCH v29 12/28] LSM: Use lsmblob in security_cred_getsecid Casey Schaufler
2021-09-24 17:54 ` [PATCH v29 13/28] IMA: Change internal interfaces to use lsmblobs Casey Schaufler
2021-09-24 17:54 ` [PATCH v29 14/28] LSM: Specify which LSM to display Casey Schaufler
2021-09-24 17:54 ` [PATCH v29 15/28] LSM: Ensure the correct LSM context releaser Casey Schaufler
2021-09-24 17:54 ` [PATCH v29 16/28] LSM: Use lsmcontext in security_secid_to_secctx Casey Schaufler
2021-09-24 17:54 ` [PATCH v29 17/28] LSM: Use lsmcontext in security_inode_getsecctx Casey Schaufler
2021-09-24 17:54 ` [PATCH v29 18/28] LSM: security_secid_to_secctx in netlink netfilter Casey Schaufler
2021-09-24 17:54 ` [PATCH v29 19/28] NET: Store LSM netlabel data in a lsmblob Casey Schaufler
2021-09-24 17:54 ` [PATCH v29 20/28] LSM: Verify LSM display sanity in binder Casey Schaufler
2021-09-24 17:54 ` [PATCH v29 21/28] LSM: Extend security_secid_to_secctx to include module selection Casey Schaufler
2021-09-24 17:54 ` [PATCH v29 22/28] Audit: Keep multiple LSM data in audit_names Casey Schaufler
2021-09-24 17:54 ` [PATCH v29 23/28] Audit: Create audit_stamp structure Casey Schaufler
2021-09-24 17:54 ` [PATCH v29 24/28] Audit: Add framework for auxiliary records Casey Schaufler
2021-09-24 17:54 ` [PATCH v29 25/28] Audit: Add record for multiple task security contexts Casey Schaufler
2021-09-24 17:54 ` [PATCH v29 26/28] Audit: Add record for multiple object " Casey Schaufler
2021-09-24 17:54 ` [PATCH v29 27/28] LSM: Add /proc attr entry for full LSM context Casey Schaufler
2021-09-24 17:54 ` [PATCH v29 28/28] 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=20210924175441.7943-10-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=sds@tycho.nsa.gov \
--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).