AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

Smack: Abstract use of ipc security blobs

Browse Source 
Don't use the ipc->security pointer directly.
Don't use the msg_msg->security pointer directly.
Provide helper functions that provides the security blob pointers.

Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
This commit is contained in:
Casey Schaufler 2018-09-21 17:19:54 -07:00 committed by Kees Cook
parent 7c6538280a
commit 019bcca462
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
security/smack/smack.h
View File

@ -24,6 +24,7 @@
#include <linux/list.h>
#include <linux/rculist.h>
#include <linux/lsm_audit.h>
#include <linux/msg.h>
/*
* Use IPv6 port labeling if IPv6 is enabled and secmarks
@ -373,6 +374,16 @@ static inline struct inode_smack *smack_inode(const struct inode *inode)
return inode->i_security + smack_blob_sizes.lbs_inode;
}
static inline struct smack_known **smack_msg_msg(const struct msg_msg *msg)
{
return (struct smack_known **)&msg->security;
}
static inline struct smack_known **smack_ipc(const struct kern_ipc_perm *ipc)
{
return (struct smack_known **)&ipc->security;
}
/*
* Is the directory transmuting?
*/

14
security/smack/smack_lsm.c
View File

@ -2834,7 +2834,9 @@ static void smack_msg_msg_free_security(struct msg_msg *msg)
*/
static struct smack_known *smack_of_ipc(struct kern_ipc_perm *isp)
{
return (struct smack_known *)isp->security;
struct smack_known **blob = smack_ipc(isp);
return *blob;
}
/**
@ -2845,9 +2847,9 @@ static struct smack_known *smack_of_ipc(struct kern_ipc_perm *isp)
*/
static int smack_ipc_alloc_security(struct kern_ipc_perm *isp)
{
struct smack_known *skp = smk_of_current();
struct smack_known **blob = smack_ipc(isp);
isp->security = skp;
*blob = smk_of_current();
return 0;
}
@ -3159,7 +3161,8 @@ static int smack_msg_queue_msgrcv(struct kern_ipc_perm *isp, struct msg_msg *msg
*/
static int smack_ipc_permission(struct kern_ipc_perm *ipp, short flag)
{
struct smack_known *iskp = ipp->security;
struct smack_known **blob = smack_ipc(ipp);
struct smack_known *iskp = *blob;
int may = smack_flags_to_may(flag);
struct smk_audit_info ad;
int rc;
@ -3180,7 +3183,8 @@ static int smack_ipc_permission(struct kern_ipc_perm *ipp, short flag)
*/
static void smack_ipc_getsecid(struct kern_ipc_perm *ipp, u32 *secid)
{
struct smack_known *iskp = ipp->security;
struct smack_known **blob = smack_ipc(ipp);
struct smack_known *iskp = *blob;
*secid = iskp->smk_secid;
}