diff options
| author | Casey Schaufler <casey@schaufler-ca.com> | 2011-09-30 05:21:01 +0400 |
|---|---|---|
| committer | Casey Schaufler <cschaufler@cschaufler-intel.(none)> | 2011-10-13 01:26:07 +0400 |
| commit | ce8a432197d9892689eb4896f690b9fe6b3de598 (patch) | |
| tree | 09dff875df15be3a36f3e0dcb760d0064d4da935 | |
| parent | 531f1d453ed8a8acee4015bd64e7bcc2eab939e4 (diff) | |
| download | linux-ce8a432197d9892689eb4896f690b9fe6b3de598.tar.xz | |
Smack: Clean up comments
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>
| -rw-r--r-- | security/smack/smack.h | 5 | ||||
| -rw-r--r-- | security/smack/smack_lsm.c | 10 | ||||
| -rw-r--r-- | security/smack/smackfs.c | 7 |
3 files changed, 10 insertions, 12 deletions
diff --git a/security/smack/smack.h b/security/smack/smack.h index 174d3be9aaee..9da2b2dfdefb 100644 --- a/security/smack/smack.h +++ b/security/smack/smack.h @@ -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 diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index 2e71c3f445fc..6a8226541327 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c @@ -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 diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c index 76e520be1b5d..54f6e18dea2f 100644 --- a/security/smack/smackfs.c +++ b/security/smack/smackfs.c @@ -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); } |