Eric Dumazet
4f1d21c77b
bpf: Make sure mac_header was set before using it
commit 0326195f523a549e0a9d7fd44c70b26fd7265090 upstream.
Classic BPF has a way to load bytes starting from the mac header.
Some skbs do not have a mac header, and skb_mac_header()
in this case is returning a pointer that 65535 bytes after
skb->head.
Existing range check in bpf_internal_load_pointer_neg_helper()
was properly kicking and no illegal access was happening.
New sanity check in skb_mac_header() is firing, so we need
to avoid it.
WARNING: CPU: 1 PID: 28990 at include/linux/skbuff.h:2785 skb_mac_header include/linux/skbuff.h:2785 [inline]
WARNING: CPU: 1 PID: 28990 at include/linux/skbuff.h:2785 bpf_internal_load_pointer_neg_helper+0x1b1/0x1c0 kernel/bpf/core.c:74
Modules linked in:
CPU: 1 PID: 28990 Comm: syz-executor.0 Not tainted 5.19.0-rc4-syzkaller-00865-g4874fb9484be #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 06/29/2022
RIP: 0010:skb_mac_header include/linux/skbuff.h:2785 [inline]
RIP: 0010:bpf_internal_load_pointer_neg_helper+0x1b1/0x1c0 kernel/bpf/core.c:74
Code: ff ff 45 31 f6 e9 5a ff ff ff e8 aa 27 40 00 e9 3b ff ff ff e8 90 27 40 00 e9 df fe ff ff e8 86 27 40 00 eb 9e e8 2f 2c f3 ff <0f> 0b eb b1 e8 96 27 40 00 e9 79 fe ff ff 90 41 57 41 56 41 55 41
RSP: 0018:ffffc9000309f668 EFLAGS: 00010216
RAX: 0000000000000118 RBX: ffffffffffeff00c RCX: ffffc9000e417000
RDX: 0000000000040000 RSI: ffffffff81873f21 RDI: 0000000000000003
RBP: ffff8880842878c0 R08: 0000000000000003 R09: 000000000000ffff
R10: 000000000000ffff R11: 0000000000000001 R12: 0000000000000004
R13: ffff88803ac56c00 R14: 000000000000ffff R15: dffffc0000000000
FS: 00007f5c88a16700(0000) GS:ffff8880b9b00000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007fdaa9f6c058 CR3: 000000003a82c000 CR4: 00000000003506e0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Call Trace:
<TASK>
____bpf_skb_load_helper_32 net/core/filter.c:276 [inline]
bpf_skb_load_helper_32+0x191/0x220 net/core/filter.c:264
Fixes: f9aefd6b2aa3 ("net: warn if mac header was not set")
Reported-by: syzbot <syzkaller@googlegroups.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20220707123900.945305-1-edumazet@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
2022-07-29 17:14:16 +02:00 |
| .. |
|
bpf
|
bpf: Make sure mac_header was set before using it
|
2022-07-29 17:14:16 +02:00 |
|
cgroup
|
cgroup: Use separate src/dst nodes when preloading css_sets for migration
|
2022-07-21 20:59:17 +02:00 |
|
configs
|
|
|
|
debug
|
lockdown: also lock down previous kgdb use
|
2022-06-06 08:33:48 +02:00 |
|
dma
|
dma-debug: make things less spammy under memory pressure
|
2022-06-22 14:11:19 +02:00 |
|
events
|
perf/core: Fix data race between perf_event_set_output() and perf_mmap_close()
|
2022-07-29 17:14:10 +02:00 |
|
gcov
|
gcov: re-fix clang-11+ support
|
2021-04-14 08:24:10 +02:00 |
|
irq
|
random: remove unused irq_flags argument from add_interrupt_randomness()
|
2022-06-22 14:11:06 +02:00 |
|
livepatch
|
|
|
|
locking
|
locking/lockdep: Avoid RCU-induced noinstr fail
|
2021-11-17 09:48:28 +01:00 |
|
power
|
PM: suspend: fix return value of __setup handler
|
2022-04-15 14:18:05 +02:00 |
|
printk
|
printk: fix return value of printk.devkmsg __setup handler
|
2022-04-15 14:18:08 +02:00 |
|
rcu
|
rcu: Don't deboost before reporting expedited quiescent state
|
2022-03-28 08:46:48 +02:00 |
|
sched
|
sched/rt: Disable RT_RUNTIME_SHARE by default
|
2022-07-21 20:59:18 +02:00 |
|
time
|
timekeeping: Add raw clock fallback for random_get_entropy()
|
2022-06-22 14:11:15 +02:00 |
|
trace
|
tracing/histograms: Fix memory leak problem
|
2022-07-21 20:59:16 +02:00 |
|
.gitignore
|
kbuild: update config_data.gz only when the content of .config is changed
|
2021-05-11 14:04:16 +02:00 |
|
acct.c
|
|
|
|
async.c
|
Revert "module, async: async_synchronize_full() on module init iff async is used"
|
2022-02-23 11:59:56 +01:00 |
|
audit.c
|
audit: improve audit queue handling when "audit=1" on cmdline
|
2022-02-08 18:24:26 +01:00 |
|
audit.h
|
audit: log AUDIT_TIME_* records only from rules
|
2022-04-15 14:18:04 +02:00 |
|
audit_fsnotify.c
|
|
|
|
audit_tree.c
|
audit: move put_tree() to avoid trim_trees refcount underflow and UAF
|
2021-09-03 10:08:16 +02:00 |
|
audit_watch.c
|
audit: CONFIG_CHANGE don't log internal bookkeeping as an event
|
2020-10-01 13:17:32 +02:00 |
|
auditfilter.c
|
audit: fix a net reference leak in audit_list_rules_send()
|
2020-06-22 09:30:59 +02:00 |
|
auditsc.c
|
audit: log AUDIT_TIME_* records only from rules
|
2022-04-15 14:18:04 +02:00 |
|
backtracetest.c
|
|
|
|
bounds.c
|
|
|
|
capability.c
|
|
|
|
compat.c
|
|
|
|
configs.c
|
|
|
|
context_tracking.c
|
|
|
|
cpu.c
|
random: clear fast pool, crng, and batches in cpuhp bring up
|
2022-06-22 14:11:12 +02:00 |
|
cpu_pm.c
|
kernel/cpu_pm: Fix uninitted local in cpu_pm
|
2020-06-22 09:31:22 +02:00 |
|
crash_core.c
|
|
|
|
crash_dump.c
|
|
|
|
cred.c
|
|
|
|
delayacct.c
|
|
|
|
dma.c
|
|
|
|
exec_domain.c
|
|
|
|
exit.c
|
don't dump the threads that had been already exiting when zapped.
|
2020-11-18 19:20:31 +01:00 |
|
extable.c
|
|
|
|
fail_function.c
|
fail_function: Remove a redundant mutex unlock
|
2020-11-24 13:29:18 +01:00 |
|
fork.c
|
copy_process(): Move fd_install() out of sighand->siglock critical section
|
2022-02-23 12:00:00 +01:00 |
|
freezer.c
|
|
|
|
futex.c
|
mm, futex: fix shared futex pgoff on shmem huge page
|
2021-06-30 08:47:55 -04:00 |
|
gen_kheaders.sh
|
kbuild: add variables for compression tools
|
2020-09-03 11:27:10 +02:00 |
|
groups.c
|
|
|
|
hung_task.c
|
|
|
|
iomem.c
|
|
|
|
irq_work.c
|
|
|
|
jump_label.c
|
|
|
|
kallsyms.c
|
kallsyms: Refactor kallsyms_show_value() to take cred
|
2020-07-16 08:16:44 +02:00 |
|
kcmp.c
|
exec: Transform exec_update_mutex into a rw_semaphore
|
2021-01-09 13:44:55 +01:00 |
|
Kconfig.freezer
|
|
|
|
Kconfig.hz
|
|
|
|
Kconfig.locks
|
|
|
|
Kconfig.preempt
|
|
|
|
kcov.c
|
|
|
|
kexec.c
|
|
|
|
kexec_core.c
|
kernel: kexec: remove the lock operation of system_transition_mutex
|
2021-02-03 23:25:56 +01:00 |
|
kexec_elf.c
|
|
|
|
kexec_file.c
|
kexec_file: drop weak attribute from arch_kexec_apply_relocations[_add]
|
2022-07-02 16:28:50 +02:00 |
|
kexec_internal.h
|
|
|
|
kheaders.c
|
|
|
|
kmod.c
|
|
|
|
kprobes.c
|
kprobes: Limit max data_size of the kretprobe instances
|
2021-12-08 09:01:10 +01:00 |
|
ksysfs.c
|
|
|
|
kthread.c
|
kthread: Fix PF_KTHREAD vs to_kthread() race
|
2021-09-12 08:56:39 +02:00 |
|
latencytop.c
|
|
|
|
Makefile
|
kbuild: update config_data.gz only when the content of .config is changed
|
2021-05-11 14:04:16 +02:00 |
|
module-internal.h
|
|
|
|
module.c
|
module/ftrace: handle patchable-function-entry
|
2022-02-23 11:59:56 +01:00 |
|
module_signature.c
|
module: harden ELF info handling
|
2021-04-07 14:47:38 +02:00 |
|
module_signing.c
|
module: harden ELF info handling
|
2021-04-07 14:47:38 +02:00 |
|
notifier.c
|
kernel/notifier.c: intercept duplicate registrations to avoid infinite loops
|
2020-10-01 13:17:23 +02:00 |
|
nsproxy.c
|
|
|
|
padata.c
|
|
|
|
panic.c
|
|
|
|
params.c
|
|
|
|
pid.c
|
|
|
|
pid_namespace.c
|
memcg: enable accounting for pids in nested pid namespaces
|
2021-09-22 12:26:37 +02:00 |
|
profile.c
|
profiling: fix shift-out-of-bounds bugs
|
2021-09-26 14:07:09 +02:00 |
|
ptrace.c
|
ptrace: Reimplement PTRACE_KILL by always sending SIGKILL
|
2022-06-14 18:11:24 +02:00 |
|
range.c
|
|
|
|
reboot.c
|
reboot: fix overflow parsing reboot cpu number
|
2020-11-18 19:20:30 +01:00 |
|
relay.c
|
kernel/relay.c: fix memleak on destroy relay channel
|
2020-08-26 10:40:51 +02:00 |
|
resource.c
|
/dev/mem: Revoke mappings when a driver claims the region
|
2020-06-24 17:50:35 +02:00 |
|
rseq.c
|
|
|
|
seccomp.c
|
seccomp: Invalidate seccomp mode to catch death failures
|
2022-02-16 12:52:53 +01:00 |
|
signal.c
|
signal handling: don't use BUG_ON() for debugging
|
2022-07-21 20:59:27 +02:00 |
|
smp.c
|
smp: Fix offline cpu check in flush_smp_call_function_queue()
|
2022-04-20 09:19:39 +02:00 |
|
smpboot.c
|
kthread: Extract KTHREAD_IS_PER_CPU
|
2021-02-07 15:35:49 +01:00 |
|
smpboot.h
|
|
|
|
softirq.c
|
|
|
|
stackleak.c
|
|
|
|
stacktrace.c
|
|
|
|
stop_machine.c
|
|
|
|
sys.c
|
prctl: allow to setup brk for et_dyn executables
|
2021-09-26 14:07:08 +02:00 |
|
sys_ni.c
|
|
|
|
sysctl-test.c
|
kernel/sysctl-test: Add null pointer test for sysctl.c:proc_dointvec()
|
2020-10-01 13:17:10 +02:00 |
|
sysctl.c
|
mm: sysctl: fix missing numa_stat when !CONFIG_HUGETLB_PAGE
|
2022-07-21 20:59:24 +02:00 |
|
sysctl_binary.c
|
|
|
|
task_work.c
|
|
|
|
taskstats.c
|
|
|
|
test_kprobes.c
|
|
|
|
torture.c
|
|
|
|
tracepoint.c
|
tracepoint: Add tracepoint_probe_register_may_exist() for BPF tracing
|
2021-07-14 16:53:08 +02:00 |
|
tsacct.c
|
taskstats: Cleanup the use of task->exit_code
|
2022-02-23 11:59:57 +01:00 |
|
ucount.c
|
|
|
|
uid16.c
|
|
|
|
uid16.h
|
|
|
|
umh.c
|
usermodehelper: reset umask to default before executing user process
|
2020-10-14 10:32:58 +02:00 |
|
up.c
|
smp: Fix smp_call_function_single_async prototype
|
2021-05-14 09:44:33 +02:00 |
|
user-return-notifier.c
|
|
|
|
user.c
|
|
|
|
user_namespace.c
|
|
|
|
utsname.c
|
|
|
|
utsname_sysctl.c
|
|
|
|
watchdog.c
|
|
|
|
watchdog_hld.c
|
|
|
|
workqueue.c
|
workqueue: Fix unbind_workers() VS wq_worker_running() race
|
2022-01-16 09:15:38 +01:00 |
|
workqueue_internal.h
|
|
|