| 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
| ||
|
Message-ID: <CAADnVQKmnzDueZ22rcYc1FuBpFKPJqb_NueT_HTcK3Bqt7O76w@mail.gmail.com>
Date: Thu, 20 Jun 2024 20:54:32 -0700
From: Alexei Starovoitov <alexei.starovoitov@...il.com>
To: Wojciech Gładysz <wojciech.gladysz@...ogain.com>
Cc: syzbot+1971e47e5210c718db3c@...kaller.appspotmail.com,
Andrii Nakryiko <andrii@...nel.org>, Alexei Starovoitov <ast@...nel.org>, bpf <bpf@...r.kernel.org>,
Daniel Borkmann <daniel@...earbox.net>, Eddy Z <eddyz87@...il.com>, Hao Luo <haoluo@...gle.com>,
John Fastabend <john.fastabend@...il.com>, Jiri Olsa <jolsa@...nel.org>,
KP Singh <kpsingh@...nel.org>, LKML <linux-kernel@...r.kernel.org>,
Martin KaFai Lau <martin.lau@...ux.dev>, Stanislav Fomichev <sdf@...gle.com>, Song Liu <song@...nel.org>,
syzkaller-bugs <syzkaller-bugs@...glegroups.com>, Yonghong Song <yonghong.song@...ux.dev>
Subject: Re: [PATCH] kernel/bpf: enable BPF bytecode call parsing for uninit value
On Tue, Jun 18, 2024 at 6:05 AM Wojciech Gładysz
<wojciech.gladysz@...ogain.com> wrote:
>
> Some syzkaller repros create BPF code that passes as an argument to map
> functions a pointer to uninitialized map key on bpf program stack. So far
> handling calls to map functions did not check for not/initialized
> pointed to values with some comments that it was not possible to tell the
> pointer use be read or write op. This led to KMSAN report in a case of
> reading not initialized map key.
> The fix assumes ARG_PTR_TO_MAP_KEY arguments to map function calls from
> BPF byte code are always of read type. For read access the value pointed
> to by map key pointer is expected to be initialized. Otherwise the BPF
> bytecode will not load.
>
> You may want to add an STX line to your repro.c to init stack value
> pointed to by R2 BPF register and adjust memcpy length:
>
> memcpy((void*)0x20000458,
> "\x00\x00\x00\x00\x00\x00\x00\x00" // ...
> "\xb7\x08\x00\x00\x00\x00\x00\x00" // ALU64_MOV_K
> "\x1f\x00\x00\x00\x00\x00\x00\x00" // SUB_X?
> "\xbf\xa2\x00\x00\x00\x00\x00\x00" // ALU64_MOV_X
> "\x07\x02\x00\x00\xf8\xff\xff\xff" // ALU(64)_ADD_{K,X}
> "\x7a\x02\x00\x00\xef\xbe\xad\xde" // *** STX ***
> "\xb7\x03\x00\x00\x00\x00\x00\x00" // ALU64_MOV_K
> "\xb7\x04\x00\x00\x00\x00\x00\x00" // ALU64_MOV_K
> "\x85\x00\x00\x00\xc3\x00\x00\x00" // CALL
> "\x95", 73); // EXIT
>
> Syzbot report
>
> =====================================================
> BUG: KMSAN: uninit-value in __htab_map_lookup_elem kernel/bpf/hashtab.c:691 [inline]
> BUG: KMSAN: uninit-value in htab_lru_percpu_map_lookup_percpu_elem+0x3f8/0x630 kernel/bpf/hashtab.c:2343
> __htab_map_lookup_elem kernel/bpf/hashtab.c:691 [inline]
> htab_lru_percpu_map_lookup_percpu_elem+0x3f8/0x630 kernel/bpf/hashtab.c:2343
> ____bpf_map_lookup_percpu_elem kernel/bpf/helpers.c:133 [inline]
> bpf_map_lookup_percpu_elem+0x67/0x90 kernel/bpf/helpers.c:130
> ___bpf_prog_run+0x13fe/0xe0f0 kernel/bpf/core.c:1997
> __bpf_prog_run32+0xb2/0xe0 kernel/bpf/core.c:2236
> bpf_dispatcher_nop_func include/linux/bpf.h:1234 [inline]
> __bpf_prog_run include/linux/filter.h:657 [inline]
> bpf_prog_run include/linux/filter.h:664 [inline]
> __bpf_trace_run kernel/trace/bpf_trace.c:2381 [inline]
> bpf_trace_run2+0x116/0x300 kernel/trace/bpf_trace.c:2420
> __bpf_trace_kfree+0x29/0x40 include/trace/events/kmem.h:94
> trace_kfree include/trace/events/kmem.h:94 [inline]
> kfree+0x6a5/0xa30 mm/slub.c:4377
> security_task_free+0x115/0x150 security/security.c:3032
> __put_task_struct+0x17f/0x730 kernel/fork.c:976
> put_task_struct include/linux/sched/task.h:138 [inline]
> delayed_put_task_struct+0x8a/0x280 kernel/exit.c:229
> rcu_do_batch kernel/rcu/tree.c:2196 [inline]
> rcu_core+0xa59/0x1e70 kernel/rcu/tree.c:2471
> rcu_core_si+0x12/0x20 kernel/rcu/tree.c:2488
> __do_softirq+0x1c0/0x7d7 kernel/softirq.c:554
> invoke_softirq kernel/softirq.c:428 [inline]
> __irq_exit_rcu kernel/softirq.c:633 [inline]
> irq_exit_rcu+0x6a/0x130 kernel/softirq.c:645
> instr_sysvec_apic_timer_interrupt arch/x86/kernel/apic/apic.c:1043 [inline]
> sysvec_apic_timer_interrupt+0x83/0x90 arch/x86/kernel/apic/apic.c:1043
> asm_sysvec_apic_timer_interrupt+0x1f/0x30 arch/x86/include/asm/idtentry.h:702
> __msan_metadata_ptr_for_load_8+0x31/0x40 mm/kmsan/instrumentation.c:92
> filter_irq_stacks+0x60/0x1a0 kernel/stacktrace.c:397
> stack_depot_save_flags+0x2c/0x6e0 lib/stackdepot.c:609
> stack_depot_save+0x12/0x20 lib/stackdepot.c:685
> __msan_poison_alloca+0x106/0x1b0 mm/kmsan/instrumentation.c:285
> arch_local_save_flags arch/x86/include/asm/irqflags.h:67 [inline]
> arch_local_irq_save arch/x86/include/asm/irqflags.h:103 [inline]
> __raw_spin_lock_irqsave include/linux/spinlock_api_smp.h:108 [inline]
> _raw_spin_lock_irqsave+0x35/0xc0 kernel/locking/spinlock.c:162
> remove_wait_queue+0x36/0x270 kernel/sched/wait.c:54
> do_wait+0x34a/0x530 kernel/exit.c:1640
> kernel_wait4+0x2ab/0x480 kernel/exit.c:1790
> __do_sys_wait4 kernel/exit.c:1818 [inline]
> __se_sys_wait4 kernel/exit.c:1814 [inline]
> __x64_sys_wait4+0x14e/0x310 kernel/exit.c:1814
> x64_sys_call+0x6e6/0x3b50 arch/x86/include/generated/asm/syscalls_64.h:62
> do_syscall_x64 arch/x86/entry/common.c:52 [inline]
> do_syscall_64+0xcf/0x1e0 arch/x86/entry/common.c:83
> entry_SYSCALL_64_after_hwframe+0x77/0x7f
>
> Local variable stack created at:
> __bpf_prog_run32+0x43/0xe0 kernel/bpf/core.c:2236
> bpf_dispatcher_nop_func include/linux/bpf.h:1234 [inline]
> __bpf_prog_run include/linux/filter.h:657 [inline]
> bpf_prog_run include/linux/filter.h:664 [inline]
> __bpf_trace_run kernel/trace/bpf_trace.c:2381 [inline]
> bpf_trace_run2+0x116/0x300 kernel/trace/bpf_trace.c:2420
>
> CPU: 0 PID: 5018 Comm: strace-static-x Not tainted 6.9.0-rc3-syzkaller-00355-g7efd0a74039f #0
> Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 03/27/2024
> =====================================================
>
> Reported-by: syzbot+1971e47e5210c718db3c@...kaller.appspotmail.com
> Closes: https://syzkaller.appspot.com/bug?extid=1971e47e5210c718db3c
> Link: https://lore.kernel.org/all/0000000000008312ad06163b7225@google.com/T/
> Signed-off-by: Wojciech Gładysz <wojciech.gladysz@...ogain.com>
> ---
> kernel/bpf/verifier.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
> index 36ef8e96787e..13a9c2e2908a 100644
> --- a/kernel/bpf/verifier.c
> +++ b/kernel/bpf/verifier.c
> @@ -7146,8 +7146,8 @@ static int check_stack_range_initialized(
> * reads. However, if raw_mode is not set, we'll do extra
> * checks below.
> */
> - bounds_check_type = BPF_WRITE;
> - clobber = true;
> + clobber = !meta || meta->raw_mode;
> + bounds_check_type = clobber ? BPF_WRITE : BPF_READ;
> } else {
> bounds_check_type = BPF_READ;
> }
> @@ -7230,8 +7230,7 @@ static int check_stack_range_initialized(
> stype = &state->stack[spi].slot_type[slot % BPF_REG_SIZE];
> if (*stype == STACK_MISC)
> goto mark;
> - if ((*stype == STACK_ZERO) ||
> - (*stype == STACK_INVALID && env->allow_uninit_stack)) {
> + if (*stype == STACK_ZERO) {
> if (clobber) {
> /* helper can write anything into the stack */
> *stype = STACK_MISC;
> @@ -8748,6 +8747,8 @@ static int check_func_arg(struct bpf_verifier_env *env, u32 arg,
> meta->map_uid = reg->map_uid;
> break;
> case ARG_PTR_TO_MAP_KEY:
> + /* always mark read access */
> + meta->raw_mode = false;
Lots of tests fail due to this restriction:
https://github.com/kernel-patches/bpf/actions/runs/9607559206/job/26499144429
In general bpf allows uninitialized stack access with cap_bpf and cap_perfmon.
We did a few hacks to shut up KMSAN with the interpreter, but
syzbot reports will keep coming.
We're going to ignore them all.
Sorry, KMSAN provides no value here.
Please focus on fixing real bugs.
Powered by blists - more mailing lists