UBUNTU: SAUCE: LSM: Use lsmblob in security_ipc_getsecid

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>
Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-by: Andrea Righi <andrea.righi@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/include/linux/security.h b/include/linux/security.h
index 5ab3ba61e5bdfa696641549150f4e1c2ae104584..29a6fef9e36365945b8224f008c56b97b776d899 100644 (file)
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -515,7 +515,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);
@@ -1272,9 +1272,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 c8f8f6276c206f49b167bd8317193f624bd913de..dd9f60c870eaa1b587d8ee2cbd2110dae7afabd7 100644 (file)
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -2338,12 +2338,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 f0d013fdd5e4cd6d161eefc701f6328ea53b99d2..497262f67fcc7607fb5c659727007b0add2133b4 100644 (file)
--- a/security/security.c
+++ b/security/security.c
@@ -1952,10 +1952,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)