[PATCH -next 1/3] apparmor: Fix match_mnt_path_str() and match_mnt() kernel-doc comment

John Johansen john.johansen at canonical.com
Sat Jan 29 23:59:42 UTC 2022


On 1/28/22 18:50, Yang Li wrote:
> Fix a spelling problem and change @mntpath to @path to remove warnings
> found by running scripts/kernel-doc, which is caused by using 'make W=1'.
> 
> security/apparmor/mount.c:321: warning: Function parameter or member
> 'devname' not described in 'match_mnt_path_str'
> security/apparmor/mount.c:321: warning: Excess function parameter
> 'devnme' description in 'match_mnt_path_str'
> security/apparmor/mount.c:377: warning: Function parameter or member
> 'path' not described in 'match_mnt'
> security/apparmor/mount.c:377: warning: Excess function parameter
> 'mntpath' description in 'match_mnt'
> 
> Reported-by: Abaci Robot <abaci at linux.alibaba.com>
> Signed-off-by: Yang Li <yang.lee at linux.alibaba.com>
Acked-by: John Johansen <john.johansen at canonical.com>

I have pulled this into my tree

> ---
>  security/apparmor/mount.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/security/apparmor/mount.c b/security/apparmor/mount.c
> index 23aafe68d49a..5cc5de062fc8 100644
> --- a/security/apparmor/mount.c
> +++ b/security/apparmor/mount.c
> @@ -304,7 +304,7 @@ static int path_flags(struct aa_profile *profile, const struct path *path)
>   * @profile: the confining profile
>   * @mntpath: for the mntpnt (NOT NULL)
>   * @buffer: buffer to be used to lookup mntpath
> - * @devnme: string for the devname/src_name (MAY BE NULL OR ERRPTR)
> + * @devname: string for the devname/src_name (MAY BE NULL OR ERRPTR)
>   * @type: string for the dev type (MAYBE NULL)
>   * @flags: mount flags to match
>   * @data: fs mount data (MAYBE NULL)
> @@ -359,7 +359,7 @@ static int match_mnt_path_str(struct aa_profile *profile,
>  /**
>   * match_mnt - handle path matching for mount
>   * @profile: the confining profile
> - * @mntpath: for the mntpnt (NOT NULL)
> + * @path: for the mntpnt (NOT NULL)
>   * @buffer: buffer to be used to lookup mntpath
>   * @devpath: path devname/src_name (MAYBE NULL)
>   * @devbuffer: buffer to be used to lookup devname/src_name



More information about the Linux-security-module-archive mailing list