From: Daniel Borkmann <daniel@iogearbox.net>
To: Tatsuhiko Yasumatsu <th.yasumatsu@gmail.com>,
Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>
Cc: Martin KaFai Lau <kafai@fb.com>, Song Liu <songliubraving@fb.com>,
Yonghong Song <yhs@fb.com>,
John Fastabend <john.fastabend@gmail.com>,
KP Singh <kpsingh@kernel.org>,
netdev@vger.kernel.org, bpf@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] bpf: Fix integer overflow in prealloc_elems_and_freelist()
Date: Tue, 28 Sep 2021 14:29:43 +0200 [thread overview]
Message-ID: <9be5acb8-5eaa-6101-1be8-a74d7df7e20e@iogearbox.net> (raw)
In-Reply-To: <20210925053106.1031798-1-th.yasumatsu@gmail.com>
On 9/25/21 7:31 AM, Tatsuhiko Yasumatsu wrote:
> In prealloc_elems_and_freelist(), the multiplication to calculate the
> size passed to bpf_map_area_alloc() could lead to an integer overflow.
> As a result, out-of-bounds write could occur in pcpu_freelist_populate()
> as reported by KASAN:
>
> [...]
> [ 16.968613] BUG: KASAN: slab-out-of-bounds in pcpu_freelist_populate+0xd9/0x100
> [ 16.969408] Write of size 8 at addr ffff888104fc6ea0 by task crash/78
> [ 16.970038]
> [ 16.970195] CPU: 0 PID: 78 Comm: crash Not tainted 5.15.0-rc2+ #1
> [ 16.970878] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.13.0-1ubuntu1.1 04/01/2014
> [ 16.972026] Call Trace:
> [ 16.972306] dump_stack_lvl+0x34/0x44
> [ 16.972687] print_address_description.constprop.0+0x21/0x140
> [ 16.973297] ? pcpu_freelist_populate+0xd9/0x100
> [ 16.973777] ? pcpu_freelist_populate+0xd9/0x100
> [ 16.974257] kasan_report.cold+0x7f/0x11b
> [ 16.974681] ? pcpu_freelist_populate+0xd9/0x100
> [ 16.975190] pcpu_freelist_populate+0xd9/0x100
> [ 16.975669] stack_map_alloc+0x209/0x2a0
> [ 16.976106] __sys_bpf+0xd83/0x2ce0
> [...]
>
> The possibility of this overflow was originally discussed in [0], but
> was overlooked.
>
> Fix the integer overflow by casting one operand to u64.
>
> [0] https://lore.kernel.org/bpf/728b238e-a481-eb50-98e9-b0f430ab01e7@gmail.com/
>
> Fixes: 557c0c6e7df8 ("bpf: convert stackmap to pre-allocation")
> Signed-off-by: Tatsuhiko Yasumatsu <th.yasumatsu@gmail.com>
> ---
> kernel/bpf/stackmap.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/kernel/bpf/stackmap.c b/kernel/bpf/stackmap.c
> index 09a3fd97d329..8941dc83a769 100644
> --- a/kernel/bpf/stackmap.c
> +++ b/kernel/bpf/stackmap.c
> @@ -66,7 +66,7 @@ static int prealloc_elems_and_freelist(struct bpf_stack_map *smap)
> u32 elem_size = sizeof(struct stack_map_bucket) + smap->map.value_size;
Thanks a lot for the fix, Tatsuhiko! Could we just change the above elem_size to u64 instead?
> int err;
>
> - smap->elems = bpf_map_area_alloc(elem_size * smap->map.max_entries,
> + smap->elems = bpf_map_area_alloc((u64)elem_size * smap->map.max_entries,
> smap->map.numa_node);
> if (!smap->elems)
> return -ENOMEM;
>
Best,
Daniel
next prev parent reply other threads:[~2021-09-28 12:29 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-25 5:31 [PATCH] bpf: Fix integer overflow in prealloc_elems_and_freelist() Tatsuhiko Yasumatsu
2021-09-28 12:29 ` Daniel Borkmann [this message]
2021-09-30 12:14 ` Tatushiko Yasumatsu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9be5acb8-5eaa-6101-1be8-a74d7df7e20e@iogearbox.net \
--to=daniel@iogearbox.net \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=kpsingh@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=songliubraving@fb.com \
--cc=th.yasumatsu@gmail.com \
--cc=yhs@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).