Re: [PATCH] apparmor: Fix the return value in split_token_from_name() kernel-doc

[John Johansen <john.johansen@canonical.com>]

On 9/11/26 17:03, Karl Mehltretter wrote:
> split_token_from_name() returns ERR_PTR(-EINVAL) for malformed input,
> but its kernel-doc describes NULL as the failure result. NULL is instead
> a successful result when the name following the token is empty.
> 
> Document all three results: the name, NULL for an empty name, and an
> error pointer for malformed input.
> 
> Fixes: 63e2b423771a ("AppArmor: userspace interfaces")
> Assisted-by: LLM
> Signed-off-by: Karl Mehltretter <kmehltretter@gmail.com>

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

I have pulled this into the apparmor tree

> ---
>   security/apparmor/procattr.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/security/apparmor/procattr.c b/security/apparmor/procattr.c
> index c07b6e8fd9c93c73ea82361af83337774e6d1bdf..cfc45db43aa0c7418604fbba0e4c30a90f0f6cbd 100644
> --- a/security/apparmor/procattr.c
> +++ b/security/apparmor/procattr.c
> @@ -74,7 +74,8 @@ int aa_getprocattr(struct aa_label *label, char **string, bool newline)
>    * @args: string to parse  (NOT NULL)
>    * @token: stores returned parsed token value  (NOT NULL)
>    *
> - * Returns: start position of name after token else NULL on failure
> + * Returns: the name following the token, %NULL if the name is empty, or
> + * ERR_PTR(-EINVAL) if the input is malformed.
>    */
>   static char *split_token_from_name(const char *op, char *args, u64 *token)
>   {