[PATCH -next 2/2] apparmor: Modify mismatched function name

[PATCH -next 2/2] apparmor: Modify mismatched function name

[Jiapeng Chong]

No functional modification involved.

security/apparmor/lib.c:93: warning: expecting prototype for aa_mask_to_str(). Prototype was for val_mask_to_str() instead.

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=13606
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
---
 security/apparmor/lib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/security/apparmor/lib.c b/security/apparmor/lib.c
index dd5dcbe5daf7..325f26f39a63 100644
--- a/security/apparmor/lib.c
+++ b/security/apparmor/lib.c
@@ -82,7 +82,7 @@ int aa_parse_debug_params(const char *str)
 }
 
 /**
- * aa_mask_to_str - convert a perm mask to its short string
+ * val_mask_to_str - convert a perm mask to its short string
  * @str: character buffer to store string in (at least 10 characters)
  * @str_size: size of the @str buffer
  * @chrs: NUL-terminated character buffer of permission characters
-- 
2.32.0.3.g01195cf9f

[PATCH -next 1/2] apparmor: Modify mismatched function name

[Jiapeng Chong]

No functional modification involved.

security/apparmor/file.c:184: warning: expecting prototype for aa_lookup_fperms(). Prototype was for aa_lookup_condperms() instead.

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=13605
Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>
---
 security/apparmor/file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/security/apparmor/file.c b/security/apparmor/file.c
index 85f89814af1e..f113eedbc208 100644
--- a/security/apparmor/file.c
+++ b/security/apparmor/file.c
@@ -169,7 +169,7 @@ static int path_name(const char *op, const struct cred *subj_cred,
 
 struct aa_perms default_perms = {};
 /**
- * aa_lookup_fperms - convert dfa compressed perms to internal perms
+ * aa_lookup_condperms - convert dfa compressed perms to internal perms
  * @subj_uid: uid to use for subject owner test
  * @rules: the aa_policydb to lookup perms for  (NOT NULL)
  * @state: state in dfa
-- 
2.32.0.3.g01195cf9f

Re: [PATCH -next 1/2] apparmor: Modify mismatched function name

[John Johansen]

On 1/20/25 18:44, Jiapeng Chong wrote:
> No functional modification involved.
> 
> security/apparmor/file.c:184: warning: expecting prototype for aa_lookup_fperms(). Prototype was for aa_lookup_condperms() instead.
> 
> Reported-by: Abaci Robot <abaci@linux.alibaba.com>
> Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=13605
> Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>

Acked-by: John Johansen <john.johansen@canonical.com>

I have pulled this into my tree

> ---
>   security/apparmor/file.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/security/apparmor/file.c b/security/apparmor/file.c
> index 85f89814af1e..f113eedbc208 100644
> --- a/security/apparmor/file.c
> +++ b/security/apparmor/file.c
> @@ -169,7 +169,7 @@ static int path_name(const char *op, const struct cred *subj_cred,
>   
>   struct aa_perms default_perms = {};
>   /**
> - * aa_lookup_fperms - convert dfa compressed perms to internal perms
> + * aa_lookup_condperms - convert dfa compressed perms to internal perms
>    * @subj_uid: uid to use for subject owner test
>    * @rules: the aa_policydb to lookup perms for  (NOT NULL)
>    * @state: state in dfa

Re: [PATCH -next 2/2] apparmor: Modify mismatched function name

[John Johansen]

On 1/20/25 18:44, Jiapeng Chong wrote:
> No functional modification involved.
> 
> security/apparmor/lib.c:93: warning: expecting prototype for aa_mask_to_str(). Prototype was for val_mask_to_str() instead.
> 
> Reported-by: Abaci Robot <abaci@linux.alibaba.com>
> Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=13606
> Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com>

Acked-by: John Johansen <john.johansen@canonical.com>

I have pulled this into my tree

> ---
>   security/apparmor/lib.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/security/apparmor/lib.c b/security/apparmor/lib.c
> index dd5dcbe5daf7..325f26f39a63 100644
> --- a/security/apparmor/lib.c
> +++ b/security/apparmor/lib.c
> @@ -82,7 +82,7 @@ int aa_parse_debug_params(const char *str)
>   }
>   
>   /**
> - * aa_mask_to_str - convert a perm mask to its short string
> + * val_mask_to_str - convert a perm mask to its short string
>    * @str: character buffer to store string in (at least 10 characters)
>    * @str_size: size of the @str buffer
>    * @chrs: NUL-terminated character buffer of permission characters