All of lore.kernel.org
 help / color / mirror / Atom feed
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, linux-audit@redhat.com,
	keescook@chromium.org, john.johansen@canonical.com,
	penguin-kernel@i-love.sakura.ne.jp, paul@paul-moore.com,
	sds@tycho.nsa.gov, linux-kernel@vger.kernel.org
Subject: [PATCH v24 09/25] LSM: Use lsmblob in security_ipc_getsecid
Date: Tue, 26 Jan 2021 08:40:52 -0800	[thread overview]
Message-ID: <20210126164108.1958-10-casey@schaufler-ca.com> (raw)
In-Reply-To: <20210126164108.1958-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 <sds@tycho.nsa.gov>
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 f786d8833e7d..20a47bd3930b 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -504,7 +504,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);
@@ -1233,9 +1233,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 220b3a7ed326..b3ad40787740 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -2327,11 +2327,16 @@ 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 271584938404..197f69780783 100644
--- a/security/security.c
+++ b/security/security.c
@@ -1928,10 +1928,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.25.4


WARNING: multiple messages have this Message-ID (diff)
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 v24 09/25] LSM: Use lsmblob in security_ipc_getsecid
Date: Tue, 26 Jan 2021 08:40:52 -0800	[thread overview]
Message-ID: <20210126164108.1958-10-casey@schaufler-ca.com> (raw)
In-Reply-To: <20210126164108.1958-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 <sds@tycho.nsa.gov>
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 f786d8833e7d..20a47bd3930b 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -504,7 +504,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);
@@ -1233,9 +1233,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 220b3a7ed326..b3ad40787740 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -2327,11 +2327,16 @@ 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 271584938404..197f69780783 100644
--- a/security/security.c
+++ b/security/security.c
@@ -1928,10 +1928,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.25.4

--
Linux-audit mailing list
Linux-audit@redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit


  parent reply	other threads:[~2021-01-27  0:12 UTC|newest]

Thread overview: 75+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20210126164108.1958-1-casey.ref@schaufler-ca.com>
2021-01-26 16:40 ` [PATCH v24 00/25] LSM: Module stacking for AppArmor Casey Schaufler
2021-01-26 16:40   ` Casey Schaufler
2021-01-26 16:40   ` [PATCH v24 01/25] LSM: Infrastructure management of the sock security Casey Schaufler
2021-01-26 16:40     ` Casey Schaufler
2021-01-26 16:40   ` [PATCH v24 02/25] LSM: Add the lsmblob data structure Casey Schaufler
2021-01-26 16:40     ` Casey Schaufler
2021-01-26 16:40   ` [PATCH v24 03/25] LSM: provide lsm name and id slot mappings Casey Schaufler
2021-01-26 16:40     ` Casey Schaufler
2021-01-26 16:40   ` [PATCH v24 04/25] IMA: avoid label collisions with stacked LSMs Casey Schaufler
2021-01-26 16:40     ` Casey Schaufler
2021-02-14 18:21     ` Mimi Zohar
2021-02-16 15:26       ` Casey Schaufler
2021-02-16 15:26         ` Casey Schaufler
2021-02-22 23:45       ` Casey Schaufler
2021-02-22 23:45         ` Casey Schaufler
2021-02-23  0:27         ` Mimi Zohar
2021-02-23  0:27           ` Mimi Zohar
2021-01-26 16:40   ` [PATCH v24 05/25] LSM: Use lsmblob in security_audit_rule_match Casey Schaufler
2021-01-26 16:40     ` Casey Schaufler
2021-01-26 16:40   ` [PATCH v24 06/25] LSM: Use lsmblob in security_kernel_act_as Casey Schaufler
2021-01-26 16:40     ` Casey Schaufler
2021-01-26 16:40   ` [PATCH v24 07/25] LSM: Use lsmblob in security_secctx_to_secid Casey Schaufler
2021-01-26 16:40     ` Casey Schaufler
2021-01-26 16:40   ` [PATCH v24 08/25] LSM: Use lsmblob in security_secid_to_secctx Casey Schaufler
2021-01-26 16:40     ` Casey Schaufler
2021-01-26 16:40   ` Casey Schaufler [this message]
2021-01-26 16:40     ` [PATCH v24 09/25] LSM: Use lsmblob in security_ipc_getsecid Casey Schaufler
2021-01-26 16:40   ` [PATCH v24 10/25] LSM: Use lsmblob in security_task_getsecid Casey Schaufler
2021-01-26 16:40     ` Casey Schaufler
2021-01-26 16:40   ` [PATCH v24 11/25] LSM: Use lsmblob in security_inode_getsecid Casey Schaufler
2021-01-26 16:40     ` Casey Schaufler
2021-01-26 16:40   ` [PATCH v24 12/25] LSM: Use lsmblob in security_cred_getsecid Casey Schaufler
2021-01-26 16:40     ` Casey Schaufler
2021-01-26 16:40   ` [PATCH v24 13/25] IMA: Change internal interfaces to use lsmblobs Casey Schaufler
2021-01-26 16:40     ` Casey Schaufler
2021-01-26 16:40   ` [PATCH v24 14/25] LSM: Specify which LSM to display Casey Schaufler
2021-01-26 16:40     ` Casey Schaufler
2021-01-26 16:40   ` [PATCH v24 15/25] LSM: Ensure the correct LSM context releaser Casey Schaufler
2021-01-26 16:40     ` Casey Schaufler
2021-01-26 16:40   ` [PATCH v24 16/25] LSM: Use lsmcontext in security_secid_to_secctx Casey Schaufler
2021-01-26 16:40     ` Casey Schaufler
2021-01-26 16:41   ` [PATCH v24 17/25] LSM: Use lsmcontext in security_inode_getsecctx Casey Schaufler
2021-01-26 16:41     ` Casey Schaufler
2021-01-26 16:41   ` [PATCH v24 18/25] LSM: security_secid_to_secctx in netlink netfilter Casey Schaufler
2021-01-26 16:41     ` Casey Schaufler
2021-01-26 16:41   ` [PATCH v24 19/25] NET: Store LSM netlabel data in a lsmblob Casey Schaufler
2021-01-26 16:41     ` Casey Schaufler
2021-01-26 16:41   ` [PATCH v24 20/25] LSM: Verify LSM display sanity in binder Casey Schaufler
2021-01-26 16:41     ` Casey Schaufler
2021-01-26 16:41   ` [PATCH v24 21/25] audit: add support for non-syscall auxiliary records Casey Schaufler
2021-01-26 16:41     ` Casey Schaufler
2021-01-26 18:42     ` Richard Guy Briggs
2021-01-26 18:42       ` Richard Guy Briggs
2021-01-26 18:58       ` Casey Schaufler
2021-01-26 18:58         ` Casey Schaufler
2021-01-26 20:05         ` Paul Moore
2021-01-26 20:05           ` Paul Moore
2021-01-26 20:22         ` Richard Guy Briggs
2021-01-26 20:22           ` Richard Guy Briggs
2021-01-26 16:41   ` [PATCH v24 22/25] Audit: Add new record for multiple process LSM attributes Casey Schaufler
2021-01-26 16:41     ` Casey Schaufler
2021-01-26 16:41   ` [PATCH v24 23/25] Audit: Add a new record for multiple object " Casey Schaufler
2021-01-26 16:41     ` Casey Schaufler
2021-01-26 16:41   ` [PATCH v24 24/25] LSM: Add /proc attr entry for full LSM context Casey Schaufler
2021-01-26 16:41     ` Casey Schaufler
2021-01-26 16:41   ` [PATCH v24 25/25] AppArmor: Remove the exclusive flag Casey Schaufler
2021-01-26 16:41     ` Casey Schaufler
2021-02-02 12:05   ` [PATCH v24 00/25] LSM: Module stacking for AppArmor Topi Miettinen
2021-02-02 12:05     ` Topi Miettinen
2021-02-02 15:30     ` Casey Schaufler
2021-02-02 15:30       ` Casey Schaufler
2021-02-02 17:12       ` Topi Miettinen
2021-02-02 17:12         ` Topi Miettinen
2021-02-02 18:06         ` Casey Schaufler
2021-02-02 18:06           ` 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=20210126164108.1958-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=keescook@chromium.org \
    --cc=linux-audit@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-security-module@vger.kernel.org \
    --cc=paul@paul-moore.com \
    --cc=penguin-kernel@i-love.sakura.ne.jp \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.