[apparmor] [PATCH 22/22] apparmorfs: don't duplicate kfree_link()

[John Johansen]

On 12/19/23 21:33, Al Viro wrote:
> rawdata_link_cb() is identical to it
> 
> Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>

yep, thanks Al, I assume you are going to send this up via your tree, lmk if you want it in the apparmor tree instead

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


> ---
>   security/apparmor/apparmorfs.c | 7 +------
>   1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
> index 38650e52ef57..63ca77103de9 100644
> --- a/security/apparmor/apparmorfs.c
> +++ b/security/apparmor/apparmorfs.c
> @@ -1615,11 +1615,6 @@ static char *gen_symlink_name(int depth, const char *dirname, const char *fname)
>   	return buffer;
>   }
>   
> -static void rawdata_link_cb(void *arg)
> -{
> -	kfree(arg);
> -}
> -
>   static const char *rawdata_get_link_base(struct dentry *dentry,
>   					 struct inode *inode,
>   					 struct delayed_call *done,
> @@ -1643,7 +1638,7 @@ static const char *rawdata_get_link_base(struct dentry *dentry,
>   	if (IS_ERR(target))
>   		return target;
>   
> -	set_delayed_call(done, rawdata_link_cb, target);
> +	set_delayed_call(done, kfree_link, target);
>   
>   	return target;
>   }