linux-kernel - Re: [PATCH] apparmor: fix missing error check for rhashtable_insert

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <3dc8b96b-db8c-428f-fc70-4df0e11f0d60@canonical.com>
Date:   Sun, 9 Apr 2023 16:29:16 -0700
From:   John Johansen <john.johansen@...onical.com>
To:     Danila Chernetsov <listdansp@...l.ru>
Cc:     Paul Moore <paul@...l-moore.com>, James Morris <jmorris@...ei.org>,
        "Serge E. Hallyn" <serge@...lyn.com>,
        linux-security-module@...r.kernel.org,
        linux-kernel@...r.kernel.org, lvc-project@...uxtesting.org
Subject: Re: [PATCH] apparmor: fix missing error check for
 rhashtable_insert_fast

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@...l.ru>

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

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)) {