Smack: Clean up comments

PATCH New Casey Schaufler 1 participant 1 message Sep 28, 2011

Subsystems (2)

Security (LSM) Smack security module

lore

Share & tools

lore

Casey Schaufler

author maintainer

2011-09-28 01:15 UTC #0 lore raw

PATCH 1/1 Smack: Clean up comments

This patch is targeted for the smack-next tree.

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 <[email protected]>

---

 security/smack/smack.h     |    5 ++---
 security/smack/smack_lsm.c |   10 ++++++++--
 security/smack/smackfs.c   |    7 -------
 3 files changed, 10 insertions(+), 12 deletions(-)

security/smack/smack.h +2 -3

index 174d3be..68c0b51 100644
@@ -155,7 +155,6 @@ struct smack_known {
 #define SMACK_CIPSO_SOCKET	1
 
 /*
- * 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

security/smack/smack_lsm.c +8 -2

index 2e71c3f..6a82265 100644
@@ -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

security/smack/smackfs.c +0 -7

index 76e520b..54f6e18 100644
@@ -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);
 }