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

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
...@@ -320,6 +320,7 @@ static unsigned int tomoyo_log_count; ...@@ -320,6 +320,7 @@ static unsigned int tomoyo_log_count;
* @ns: Pointer to "struct tomoyo_policy_namespace". * @ns: Pointer to "struct tomoyo_policy_namespace".
* @profile: Profile number. * @profile: Profile number.
* @index: Index number of functionality. * @index: Index number of functionality.
* @matched_acl: Pointer to "struct tomoyo_acl_info".
* @is_granted: True if granted log, false otherwise. * @is_granted: True if granted log, false otherwise.
* *
* Returns true if this request should be audited, false otherwise. * Returns true if this request should be audited, false otherwise.
......
...@@ -139,6 +139,7 @@ static int tomoyo_open(struct inode *inode, struct file *file) ...@@ -139,6 +139,7 @@ static int tomoyo_open(struct inode *inode, struct file *file)
/** /**
* tomoyo_release - close() for /sys/kernel/security/tomoyo/ interface. * tomoyo_release - close() for /sys/kernel/security/tomoyo/ interface.
* *
* @inode: Pointer to "struct inode".
* @file: Pointer to "struct file". * @file: Pointer to "struct file".
* *
*/ */
......
...@@ -63,7 +63,7 @@ static void tomoyo_bprm_committed_creds(struct linux_binprm *bprm) ...@@ -63,7 +63,7 @@ static void tomoyo_bprm_committed_creds(struct linux_binprm *bprm)
#ifndef CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER #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". * @bprm: Pointer to "struct linux_binprm".
* *
...@@ -113,8 +113,7 @@ static int tomoyo_bprm_check_security(struct linux_binprm *bprm) ...@@ -113,8 +113,7 @@ static int tomoyo_bprm_check_security(struct linux_binprm *bprm)
/** /**
* tomoyo_inode_getattr - Target for security_inode_getattr(). * tomoyo_inode_getattr - Target for security_inode_getattr().
* *
* @mnt: Pointer to "struct vfsmount". * @path: Pointer to "struct path".
* @dentry: Pointer to "struct dentry".
* *
* Returns 0 on success, negative value otherwise. * Returns 0 on success, negative value otherwise.
*/ */
...@@ -300,8 +299,7 @@ static int tomoyo_file_fcntl(struct file *file, unsigned int cmd, ...@@ -300,8 +299,7 @@ static int tomoyo_file_fcntl(struct file *file, unsigned int cmd,
/** /**
* tomoyo_file_open - Target for security_file_open(). * tomoyo_file_open - Target for security_file_open().
* *
* @f: Pointer to "struct file". * @f: Pointer to "struct file".
* @cred: Pointer to "struct cred".
* *
* Returns 0 on success, negative value otherwise. * Returns 0 on success, negative value otherwise.
*/ */
...@@ -487,8 +485,8 @@ struct lsm_blob_sizes tomoyo_blob_sizes __lsm_ro_after_init = { ...@@ -487,8 +485,8 @@ struct lsm_blob_sizes tomoyo_blob_sizes __lsm_ro_after_init = {
/** /**
* tomoyo_task_alloc - Target for security_task_alloc(). * tomoyo_task_alloc - Target for security_task_alloc().
* *
* @task: Pointer to "struct task_struct". * @task: Pointer to "struct task_struct".
* @flags: clone() flags. * @clone_flags: clone() flags.
* *
* Returns 0. * Returns 0.
*/ */
......
...@@ -83,8 +83,8 @@ const u8 tomoyo_index2category[TOMOYO_MAX_MAC_INDEX] = { ...@@ -83,8 +83,8 @@ const u8 tomoyo_index2category[TOMOYO_MAX_MAC_INDEX] = {
/** /**
* tomoyo_convert_time - Convert time_t to YYYY/MM/DD hh/mm/ss. * 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". * @stamp: Pointer to "struct tomoyo_time".
* *
* Returns nothing. * Returns nothing.
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment