[PATCH 1/3] apparmor: Fix return in ns_mkdir_op

[Ryan Lee]

On Sat, May 2, 2026 at 9:13 PM Hongling Zeng <zenghongling at kylinos.cn> wrote:
>
> Return NULL instead of passing to ERR_PTR while error is zero.
>   Fixes smatch warning:
>     - security/apparmor/apparmorfs.c:1846 ns_mkdir_op() warn:
>       passing zero to 'ERR_PTR'
>
> Fixes: 88d5baf69082 ("Change inode_operations.mkdir to return struct dentry *")
> Signed-off-by: Hongling Zeng <zenghongling at kylinos.cn>
> ---
>  security/apparmor/apparmorfs.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
> index ededaf46f3ca..1d7b1c70f22a 100644
> --- a/security/apparmor/apparmorfs.c
> +++ b/security/apparmor/apparmorfs.c
> @@ -1922,7 +1922,7 @@ static struct dentry *ns_mkdir_op(struct mnt_idmap *idmap, struct inode *dir,
>         mutex_unlock(&parent->lock);
>         aa_put_ns(parent);
>
> -       return ERR_PTR(error);
> +       return error ? ERR_PTR(error) : NULL;
>  }
>
>  static int ns_rmdir_op(struct inode *dir, struct dentry *dentry)
> --
> 2.25.1
>
>

Reviewed-by: Ryan Lee <ryan.lee at canonical.com>