Re: [PATCH] apparmor: fix missing error check for rhashtable_insert_fast

[John Johansen]

On 4/4/23 12:05, Danila Chernetsov wrote:
>   rhashtable_insert_fast() could return err value when memory allocation is
>   failed. but unpack_profile() do not check values and this always returns
>   success value. This patch just adds error check code.
>
> Found by Linux Verification Center (linuxtesting.org) with SVACE.
>
> Fixes: e025be0f26d5 ("apparmor: support querying extended trusted helper extra data")
>
> Signed-off-by: Danila Chernetsov <listdansp@xxxxxxx>

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

thanks, I have pulled this into the apparmor tree


> ---
>   security/apparmor/policy_unpack.c | 9 +++++++--
>   1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c
> index cf2ceec40b28..4d8adb21732c 100644
> --- a/security/apparmor/policy_unpack.c
> +++ b/security/apparmor/policy_unpack.c
> @@ -1046,8 +1046,13 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name)
>   				goto fail;
>   			}
>   
> -			rhashtable_insert_fast(profile->data, &data->head,
> -					       profile->data->p);
> +			if(rhashtable_insert_fast(profile->data, &data->head,
> +						profile->data->p)) {
> +				kfree_sensitive(data->key);
> +				kfree_sensitive(data);
> +				info = "failed to insert data to table";
> +				goto fail;
> +			}
>   		}
>   
>   		if (!aa_unpack_nameX(e, AA_STRUCTEND, NULL)) {