Commit b57d0209 authored by Casey Schaufler's avatar Casey Schaufler
Browse files

Smack: fix W=1 build warnings 



A couple of functions had malformed comment blocks.
Namespace parameters were added without updating the
comment blocks. These are all repaired in the Smack code,
so "% make W=1 security/smack" is warning free.

Signed-off-by: default avatarCasey Schaufler <casey@schaufler-ca.com>
parent f8de49ef

security/smack/smack_lsm.c

+18 −12
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ static int smk_copy_relabel(struct list_head *nhead, struct list_head *ohead, 


/**

 * smk_ptrace_mode - helper function for converting PTRACE_MODE_* into MAY_*

 * @mode - input mode in form of PTRACE_MODE_*

 * @mode: input mode in form of PTRACE_MODE_*

 *

 * Returns a converted MAY_* mode usable by smack rules

 */
@@ -1215,6 +1215,7 @@ static int smack_inode_getattr(const struct path *path) 


/**

 * smack_inode_setxattr - Smack check for setting xattrs

 * @mnt_userns: active user namespace

 * @dentry: the object

 * @name: name of the attribute

 * @value: value of the attribute
@@ -1341,6 +1342,7 @@ static int smack_inode_getxattr(struct dentry *dentry, const char *name) 


/**

 * smack_inode_removexattr - Smack check on removexattr

 * @mnt_userns: active user namespace

 * @dentry: the object

 * @name: name of the attribute

 *
@@ -1400,6 +1402,7 @@ static int smack_inode_removexattr(struct user_namespace *mnt_userns, 


/**

 * smack_inode_getsecurity - get smack xattrs

 * @mnt_userns: active user namespace

 * @inode: the object

 * @name: attribute name

 * @buffer: where to put the result
@@ -1621,13 +1624,14 @@ static int smack_file_fcntl(struct file *file, unsigned int cmd, 
}



/**

 * smack_mmap_file :

 * Check permissions for a mmap operation.  The @file may be NULL, e.g.

 * if mapping anonymous memory.

 * @file contains the file structure for file to map (may be NULL).

 * @reqprot contains the protection requested by the application.

 * @prot contains the protection that will be applied by the kernel.

 * @flags contains the operational flags.

 * smack_mmap_file - Check permissions for a mmap operation.

 * @file: contains the file structure for file to map (may be NULL).

 * @reqprot: contains the protection requested by the application.

 * @prot: contains the protection that will be applied by the kernel.

 * @flags: contains the operational flags.

 *

 * The @file may be NULL, e.g. if mapping anonymous memory.

 *

 * Return 0 if permission is granted.

 */

static int smack_mmap_file(struct file *file,
@@ -3054,7 +3058,7 @@ static int smack_sem_associate(struct kern_ipc_perm *isp, int semflg) 
}



/**

 * smack_sem_shmctl - Smack access check for sem

 * smack_sem_semctl - Smack access check for sem

 * @isp: the object

 * @cmd: what it wants to do

 *
@@ -3200,7 +3204,7 @@ static int smack_msg_queue_msgsnd(struct kern_ipc_perm *isp, struct msg_msg *msg 
}



/**

 * smack_msg_queue_msgsnd - Smack access check for msg_queue

 * smack_msg_queue_msgrcv - Smack access check for msg_queue

 * @isp: the object

 * @msg: unused

 * @target: unused
@@ -3209,8 +3213,10 @@ static int smack_msg_queue_msgsnd(struct kern_ipc_perm *isp, struct msg_msg *msg 
 *

 * Returns 0 if current has read and write access, error code otherwise

 */

static int smack_msg_queue_msgrcv(struct kern_ipc_perm *isp, struct msg_msg *msg,

			struct task_struct *target, long type, int mode)

static int smack_msg_queue_msgrcv(struct kern_ipc_perm *isp,

				  struct msg_msg *msg,

				  struct task_struct *target, long type,

				  int mode)

{

	return smk_curacc_msq(isp, MAY_READWRITE);

}