linux-kernel - Re: [PATCH] bpf: fix range_tree

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <ab96c4f1-fdf3-a657-fb5c-14c57d3859bc@huaweicloud.com>
Date: Tue, 7 Jan 2025 14:15:52 +0800
From: Hou Tao <houtao@...weicloud.com>
To: Soma Nakata <soma.nakata@...ane.sakura.ne.jp>
Cc: bpf@...r.kernel.org, linux-kernel@...r.kernel.org,
 Alexei Starovoitov <ast@...nel.org>, Daniel Borkmann <daniel@...earbox.net>,
 Andrii Nakryiko <andrii@...nel.org>, Martin KaFai Lau
 <martin.lau@...ux.dev>, Eduard Zingerman <eddyz87@...il.com>,
 Song Liu <song@...nel.org>, Yonghong Song <yonghong.song@...ux.dev>,
 John Fastabend <john.fastabend@...il.com>, KP Singh <kpsingh@...nel.org>,
 Stanislav Fomichev <sdf@...ichev.me>, Hao Luo <haoluo@...gle.com>,
 Jiri Olsa <jolsa@...nel.org>
Subject: Re: [PATCH] bpf: fix range_tree_set error handling



On 1/7/2025 7:15 AM, Soma Nakata wrote:
> `range_tree_set` might fail and return -ENOMEM,
> causing subsequent `bpf_arena_alloc_pages` to fail.
> Added the error handling.
>
> Signed-off-by: Soma Nakata <soma.nakata@...ane.sakura.ne.jp>
> ---
>  kernel/bpf/arena.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/kernel/bpf/arena.c b/kernel/bpf/arena.c
> index 41a76ca56040..4b22a651b5d5 100644
> --- a/kernel/bpf/arena.c
> +++ b/kernel/bpf/arena.c
> @@ -138,7 +138,11 @@ static struct bpf_map *arena_map_alloc(union bpf_attr *attr)
>  	INIT_LIST_HEAD(&arena->vma_list);
>  	bpf_map_init_from_attr(&arena->map, attr);
>  	range_tree_init(&arena->rt);
> -	range_tree_set(&arena->rt, 0, attr->max_entries);
> +	err = range_tree_set(&arena->rt, 0, attr->max_entries);
> +	if (err) {
> +		bpf_map_area_free(arena);
> +		goto err;
> +	}
>  	mutex_init(&arena->lock);
>  
>  	return &arena->map;

The fix is straightforward, so

Acked-by: Hou Tao <houtao1@...wei.com>