kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Smack: Clean up comments

Browse source 
There are a number of comments in the Smack code that
are either malformed or include code. This patch cleans
them up.

Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
This commit is contained in:
Casey Schaufler 2011-09-29 18:21:01 -07:00 committed by Casey Schaufler
parent 531f1d453e
commit ce8a432197
3 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
security/smack/smack.h
View file

@ -156,7 +156,6 @@ struct smack_known {
/*
* smackfs magic number
* smackfs macic number
*/
#define SMACK_MAGIC 0x43415d53 /* "SMAC" */
@ -182,9 +181,9 @@ struct smack_known {
#define MAY_NOT 0
/*
* Number of access types used by Smack (rwxa)
* Number of access types used by Smack (rwxat)
*/
#define SMK_NUM_ACCESS_TYPE 4
#define SMK_NUM_ACCESS_TYPE 5
/*
* Smack audit data; is empty if CONFIG_AUDIT not set

10
security/smack/smack_lsm.c
View file

@ -441,6 +441,12 @@ static int smack_sb_umount(struct vfsmount *mnt, int flags)
* BPRM hooks
*/
/**
* smack_bprm_set_creds - set creds for exec
* @bprm: the exec information
*
* Returns 0 if it gets a blob, -ENOMEM otherwise
*/
static int smack_bprm_set_creds(struct linux_binprm *bprm)
{
struct task_smack *tsp = bprm->cred->security;
@ -844,7 +850,7 @@ static void smack_inode_post_setxattr(struct dentry *dentry, const char *name,
return;
}
/*
/**
* smack_inode_getxattr - Smack check on getxattr
* @dentry: the object
* @name: unused
@ -861,7 +867,7 @@ static int smack_inode_getxattr(struct dentry *dentry, const char *name)
return smk_curacc(smk_of_inode(dentry->d_inode), MAY_READ, &ad);
}
/*
/**
* smack_inode_removexattr - Smack check on removexattr
* @dentry: the object
* @name: name of the attribute

7
security/smack/smackfs.c
View file

@ -104,9 +104,6 @@ const char *smack_cipso_option = SMACK_CIPSO_OPTION;
#define SEQ_READ_FINISHED ((loff_t)-1)
/*
#define SEQ_READ_FINISHED 1
*/
/*
* Values for parsing cipso rules
@ -475,10 +472,6 @@ static ssize_t smk_write_load(struct file *file, const char __user *buf,
if (!capable(CAP_MAC_ADMIN))
return -EPERM;
/*
return smk_write_load_list(file, buf, count, ppos, &smack_rule_list,
&smack_list_lock);
*/
return smk_write_load_list(file, buf, count, ppos, NULL, NULL);
}