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

Smack: Abstract use of file security blob

Browse Source 
Don't use the file->f_security pointer directly.
Provide a helper function that provides the security blob pointer.

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-11-12 09:38:53 -08:00 committed by Kees Cook
parent bb6c6b02cc
commit f28952ac90
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
security/smack/smack.h
View File

@ -362,6 +362,11 @@ static inline struct task_smack *smack_cred(const struct cred *cred)
return cred->security + smack_blob_sizes.lbs_cred;
}
static inline struct smack_known **smack_file(const struct file *file)
{
return (struct smack_known **)&file->f_security;
}
/*
* Is the directory transmuting?
*/

12
security/smack/smack_lsm.c
View File

@ -1489,9 +1489,9 @@ static void smack_inode_getsecid(struct inode *inode, u32 *secid)
*/
static int smack_file_alloc_security(struct file *file)
{
struct smack_known *skp = smk_of_current();
struct smack_known **blob = smack_file(file);
file->f_security = skp;
*blob = smk_of_current();
return 0;
}
@ -1731,7 +1731,9 @@ static int smack_mmap_file(struct file *file,
*/
static void smack_file_set_fowner(struct file *file)
{
file->f_security = smk_of_current();
struct smack_known **blob = smack_file(file);
*blob = smk_of_current();
}
/**
@ -1748,6 +1750,7 @@ static void smack_file_set_fowner(struct file *file)
static int smack_file_send_sigiotask(struct task_struct *tsk,
struct fown_struct *fown, int signum)
{
struct smack_known **blob;
struct smack_known *skp;
struct smack_known *tkp = smk_of_task(smack_cred(tsk->cred));
const struct cred *tcred;
@ -1761,7 +1764,8 @@ static int smack_file_send_sigiotask(struct task_struct *tsk,
file = container_of(fown, struct file, f_owner);
/* we don't log here as rc can be overriden */
skp = file->f_security;
blob = smack_file(file);
skp = *blob;
rc = smk_access(skp, tkp, MAY_DELIVER, NULL);
rc = smk_bu_note("sigiotask", skp, tkp, MAY_DELIVER, rc);