Commit 9cd19f02 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tomoyo-pr-20210628' of git://git.osdn.net/gitroot/tomoyo/tomoyo-test1 

Pull tomoyo fix from Tetsuo Handa:
 "A doc warning fix from ChenXiaoSong"

* tag 'tomoyo-pr-20210628' of git://git.osdn.net/gitroot/tomoyo/tomoyo-test1:
  tomoyo: fix doc warnings
parents 6159c49e 98eaa63e

security/tomoyo/audit.c

+1 −0
Original line number Diff line number Diff line
@@ -320,6 +320,7 @@ static unsigned int tomoyo_log_count; 
 * @ns:          Pointer to "struct tomoyo_policy_namespace".

 * @profile:     Profile number.

 * @index:       Index number of functionality.

 * @matched_acl: Pointer to "struct tomoyo_acl_info".

 * @is_granted:  True if granted log, false otherwise.

 *

 * Returns true if this request should be audited, false otherwise.

security/tomoyo/securityfs_if.c

+1 −0
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ static int tomoyo_open(struct inode *inode, struct file *file) 
/**

 * tomoyo_release - close() for /sys/kernel/security/tomoyo/ interface.

 *

 * @inode: Pointer to "struct inode".

 * @file:  Pointer to "struct file".

 *

 */

security/tomoyo/tomoyo.c

+5 −7
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static void tomoyo_bprm_committed_creds(struct linux_binprm *bprm) 


#ifndef CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER

/**

 * tomoyo_bprm_for_exec - Target for security_bprm_creds_for_exec().

 * tomoyo_bprm_creds_for_exec - Target for security_bprm_creds_for_exec().

 *

 * @bprm: Pointer to "struct linux_binprm".

 *
@@ -113,8 +113,7 @@ static int tomoyo_bprm_check_security(struct linux_binprm *bprm) 
/**

 * tomoyo_inode_getattr - Target for security_inode_getattr().

 *

 * @mnt:    Pointer to "struct vfsmount".

 * @dentry: Pointer to "struct dentry".

 * @path: Pointer to "struct path".

 *

 * Returns 0 on success, negative value otherwise.

 */
@@ -301,7 +300,6 @@ static int tomoyo_file_fcntl(struct file *file, unsigned int cmd, 
 * tomoyo_file_open - Target for security_file_open().

 *

 * @f: Pointer to "struct file".

 * @cred: Pointer to "struct cred".

 *

 * Returns 0 on success, negative value otherwise.

 */
@@ -488,7 +486,7 @@ struct lsm_blob_sizes tomoyo_blob_sizes __lsm_ro_after_init = { 
 * tomoyo_task_alloc - Target for security_task_alloc().

 *

 * @task:        Pointer to "struct task_struct".

 * @flags: clone() flags.

 * @clone_flags: clone() flags.

 *

 * Returns 0.

 */

security/tomoyo/util.c

+2 −2
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ const u8 tomoyo_index2category[TOMOYO_MAX_MAC_INDEX] = { 
/**

 * tomoyo_convert_time - Convert time_t to YYYY/MM/DD hh/mm/ss.

 *

 * @time:  Seconds since 1970/01/01 00:00:00.

 * @time64: Seconds since 1970/01/01 00:00:00.

 * @stamp:  Pointer to "struct tomoyo_time".

 *

 * Returns nothing.