iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/kernel
History
Martin KaFai Lau c9a368f1c0 bpf: net: Avoid incorrect bpf_sk_reuseport_detach call 
bpf_sk_reuseport_detach is currently called when sk->sk_user_data
is not NULL.  It is incorrect because sk->sk_user_data may not be
managed by the bpf's reuseport_array.  It has been reported in [1] that,
the bpf_sk_reuseport_detach() which is called from udp_lib_unhash() has
corrupted the sk_user_data managed by l2tp.

This patch solves it by using another bit (defined as SK_USER_DATA_BPF)
of the sk_user_data pointer value.  It marks that a sk_user_data is
managed/owned by BPF.

The patch depends on a PTRMASK introduced in
commit f1ff5ce2cd5e ("net, sk_msg: Clear sk_user_data pointer on clone if tagged").

[ Note: sk->sk_user_data is used by bpf's reuseport_array only when a sk is
  added to the bpf's reuseport_array.
  i.e. doing setsockopt(SO_REUSEPORT) and having "sk->sk_reuseport == 1"
  alone will not stop sk->sk_user_data being used by other means. ]

[1]: https://lore.kernel.org/netdev/20200706121259.GA20199@katalix.com/

Fixes: 5dc4c4b7d4e8 ("bpf: Introduce BPF_MAP_TYPE_REUSEPORT_SOCKARRAY")
Reported-by: James Chapman <jchapman@katalix.com>
Reported-by: syzbot+9f092552ba9a5efca5df@syzkaller.appspotmail.com
Signed-off-by: Martin KaFai Lau <kafai@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Tested-by: James Chapman <jchapman@katalix.com>
Acked-by: James Chapman <jchapman@katalix.com>
Link: https://lore.kernel.org/bpf/20200709061110.4019316-1-kafai@fb.com
2020-07-09 22:03:31 +02:00
..
bpf
bpf: net: Avoid incorrect bpf_sk_reuseport_detach call
2020-07-09 22:03:31 +02:00
cgroup
cgroup: fix cgroup_sk_alloc() for sk_clone_lock()
2020-07-07 13:34:11 -07:00
configs
compiler: remove CONFIG_OPTIMIZE_INLINING entirely
2020-04-07 10:43:42 -07:00
debug
maccess: rename probe_kernel_{read,write} to copy_{from,to}_kernel_nofault
2020-06-17 10:57:41 -07:00
dma
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
2020-06-30 14:20:45 -07:00
events
Merge branch 'akpm' (patches from Andrew)
2020-06-09 09:54:46 -07:00
gcov
treewide: replace '---help---' in Kconfig files with 'help'
2020-06-14 01:57:21 +09:00
irq
treewide: replace '---help---' in Kconfig files with 'help'
2020-06-14 01:57:21 +09:00
kcsan
kcsan: Support distinguishing volatile accesses
2020-06-11 20:04:01 +02:00
livepatch
livepatch: Make klp_apply_object_relocs static
2020-05-11 00:31:38 +02:00
locking
The X86 entry, exception and interrupt code rework
2020-06-13 10:05:47 -07:00
power
treewide: replace '---help---' in Kconfig files with 'help'
2020-06-14 01:57:21 +09:00
printk
Revert "kernel/printk: add kmsg SEEK_CUR handling"
2020-06-21 20:47:20 -07:00
rcu
TTY/Serial driver updates for 5.8-rc1
2020-06-07 09:52:36 -07:00
sched
Rebase locking/kcsan to locking/urgent
2020-06-11 20:02:46 +02:00
time
The X86 entry, exception and interrupt code rework
2020-06-13 10:05:47 -07:00
trace
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2020-06-25 18:27:40 -07:00
.gitignore
.gitignore: add SPDX License Identifier
2020-03-25 11:50:48 +01:00
acct.c
mmap locking API: convert mmap_sem comments
2020-06-09 09:39:14 -07:00
async.c
…
audit_fsnotify.c
fsnotify: use helpers to access data by data_type
2020-03-23 18:19:06 +01:00
audit_tree.c
…
audit_watch.c
\n
2020-04-06 08:58:42 -07:00
audit.c
audit/stable-5.8 PR 20200601
2020-06-02 17:13:37 -07:00
audit.h
audit: fix a net reference leak in audit_list_rules_send()
2020-04-22 15:23:10 -04:00
auditfilter.c
audit: fix a net reference leak in audit_list_rules_send()
2020-04-22 15:23:10 -04:00
auditsc.c
audit: add subj creds to NETFILTER_CFG record to
2020-05-20 18:09:19 -04:00
backtracetest.c
…
bounds.c
…
capability.c
…
compat.c
uaccess: Selectively open read or write user access
2020-05-01 12:35:21 +10:00
configs.c
proc: convert everything to "struct proc_ops"
2020-02-04 03:05:26 +00:00
context_tracking.c
context_tracking: Ensure that the critical path cannot be instrumented
2020-06-11 15:14:36 +02:00
cpu_pm.c
kernel/cpu_pm: Fix uninitted local in cpu_pm
2020-05-15 11:44:34 -07:00
cpu.c
The changes in this cycle are:
2020-06-03 13:06:42 -07:00
crash_core.c
…
crash_dump.c
crash_dump: Remove no longer used saved_max_pfn
2020-04-15 11:21:54 +02:00
cred.c
exec: Teach prepare_exec_creds how exec treats uids & gids
2020-05-20 14:44:21 -05:00
delayacct.c
…
dma.c
…
elfcore.c
kernel/elfcore.c: include proper prototypes
2019-09-25 17:51:39 -07:00
exec_domain.c
…
exit.c
mmap locking API: convert mmap_sem comments
2020-06-09 09:39:14 -07:00
extable.c
kernel/extable.c: use address-of operator on section symbols
2020-04-07 10:43:42 -07:00
fail_function.c
…
fork.c
mmap locking API: convert nested write lock sites
2020-06-09 09:39:14 -07:00
freezer.c
Revert "libata, freezer: avoid block device removal while system is frozen"
2019-10-06 09:11:37 -06:00
futex.c
mmap locking API: use coccinelle to convert mmap_sem rwsem call sites
2020-06-09 09:39:14 -07:00
gen_kheaders.sh
kbuild: add variables for compression tools
2020-06-06 23:42:01 +09:00
groups.c
mm: remove the pgprot argument to __vmalloc
2020-06-02 10:59:11 -07:00
hung_task.c
kernel/hung_task.c: introduce sysctl to print all traces when a hung task is detected
2020-06-08 11:05:56 -07:00
iomem.c
mm/nvdimm: add is_ioremap_addr and use that to check ioremap address
2019-07-12 11:05:40 -07:00
irq_work.c
irq_work, smp: Allow irq_work on call_single_queue
2020-05-28 10:54:15 +02:00
jump_label.c
jump_label: Don't warn on __exit jump entries
2019-08-29 15:10:10 +01:00
kallsyms.c
kallsyms: unexport kallsyms_lookup_name() and kallsyms_on_each_symbol()
2020-04-07 10:43:44 -07:00
kcmp.c
kernel/kcmp.c: Use new infrastructure to fix deadlocks in execve
2020-03-25 10:04:01 -05:00
Kconfig.freezer
…
Kconfig.hz
…
Kconfig.locks
sched/rt, locking: Use CONFIG_PREEMPTION
2019-12-08 14:37:36 +01:00
Kconfig.preempt
sched/Kconfig: Fix spelling mistake in user-visible help text
2019-11-12 11:35:32 +01:00
kcov.c
kcov: check kcov_softirq in kcov_remote_stop()
2020-06-10 19:14:17 -07:00
kexec_core.c
kexec: add machine_kexec_post_load()
2020-01-08 16:32:55 +00:00
kexec_elf.c
kexec_elf: support 32 bit ELF files
2019-09-06 23:58:44 +02:00
kexec_file.c
kexec_file: don't place kexec images on IORESOURCE_MEM_DRIVER_MANAGED
2020-06-04 19:06:23 -07:00
kexec_internal.h
kexec: add machine_kexec_post_load()
2020-01-08 16:32:55 +00:00
kexec.c
kexec: add machine_kexec_post_load()
2020-01-08 16:32:55 +00:00
kheaders.c
…
kmod.c
kmod: make request_module() return an error when autoloading is disabled
2020-04-10 15:36:22 -07:00
kprobes.c
kretprobe: Prevent triggering kretprobe from within kprobe_flush_task
2020-06-16 21:21:01 -04:00
ksysfs.c
…
kthread.c
maccess: rename probe_kernel_{read,write} to copy_{from,to}_kernel_nofault
2020-06-17 10:57:41 -07:00
latencytop.c
sysctl: pass kernel pointers to ->proc_handler
2020-04-27 02:07:40 -04:00
Makefile
Notifications over pipes + Keyring notifications
2020-06-13 09:56:21 -07:00
module_signature.c
MODSIGN: Export module signature definitions
2019-08-05 18:39:56 -04:00
module_signing.c
MODSIGN: Export module signature definitions
2019-08-05 18:39:56 -04:00
module-internal.h
…
module.c
module: move the set_fs hack for flush_icache_range to m68k
2020-06-08 11:05:58 -07:00
notifier.c
mm: remove vmalloc_sync_(un)mappings()
2020-06-02 10:59:12 -07:00
nsproxy.c
nsproxy: restore EINVAL for non-namespace file descriptor
2020-06-17 00:33:12 +02:00
padata.c
padata: add basic support for multithreaded jobs
2020-06-03 20:09:45 -07:00
panic.c
bug: Annotate WARN/BUG/stackfail as noinstr safe
2020-06-11 15:14:36 +02:00
params.c
lockdown: Lock down module params that specify hardware parameters (eg. ioport)
2019-08-19 21:54:16 -07:00
pid_namespace.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next
2020-06-03 16:27:18 -07:00
pid.c
remove the no longer needed pid_alive() check in __task_pid_nr_ns()
2020-04-30 06:40:14 -05:00
profile.c
proc: convert everything to "struct proc_ops"
2020-02-04 03:05:26 +00:00
ptrace.c
ptrace: reintroduce usage of subjective credentials in ptrace_has_cap()
2020-01-18 13:51:39 +01:00
range.c
…
reboot.c
printk: Collapse shutdown types into a single dump reason
2020-05-30 10:34:03 -07:00
relay.c
mmap locking API: convert mmap_sem comments
2020-06-09 09:39:14 -07:00
resource.c
/dev/mem: Revoke mappings when a driver claims the region
2020-05-27 11:10:05 +02:00
rseq.c
rseq: Reject unknown flags on rseq unregister
2019-12-25 10:41:20 +01:00
scs.c
scs: Report SCS usage in bytes rather than number of entries
2020-06-04 16:14:56 +01:00
seccomp.c
sysctl: pass kernel pointers to ->proc_handler
2020-04-27 02:07:40 -04:00
signal.c
Merge branch 'work.set_fs-exec' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2020-06-01 16:21:46 -07:00
smp.c
The changes in this cycle are:
2020-06-03 13:06:42 -07:00
smpboot.c
…
smpboot.h
…
softirq.c
x86/entry: Clarify irq_{enter,exit}_rcu()
2020-06-11 15:15:24 +02:00
stackleak.c
…
stacktrace.c
stacktrace: Get rid of unneeded '!!' pattern
2019-11-11 10:30:59 +01:00
stop_machine.c
stop_machine: Make stop_cpus() static
2020-01-17 10:19:21 +01:00
sys_ni.c
y2038: allow disabling time32 system calls
2019-11-15 14:38:30 +01:00
sys.c
Add additional LSM hooks for SafeSetID
2020-06-14 11:39:31 -07:00
sysctl_binary.c
sysctl: Remove the sysctl system call
2019-11-26 13:03:56 -06:00
sysctl-test.c
kunit: allow kunit tests to be loaded as a module
2020-01-09 16:42:29 -07:00
sysctl.c
kernel/sysctl.c: ignore out-of-range taint bits introduced via kernel.tainted
2020-06-08 11:05:56 -07:00
task_work.c
task_work_run: don't take ->pi_lock unconditionally
2020-03-02 14:06:33 -07:00
taskstats.c
taskstats: fix data-race
2019-12-04 15:18:39 +01:00
test_kprobes.c
…
torture.c
CPU (hotplug) updates:
2020-03-30 18:06:39 -07:00
tracepoint.c
The main changes in this release include:
2019-07-18 11:51:00 -07:00
tsacct.c
tsacct: add 64-bit btime field
2019-12-18 18:07:31 +01:00
ucount.c
ucount: Make sure ucounts in /proc/sys/user don't regress again
2020-04-07 21:51:27 +02:00
uid16.c
…
uid16.h
…
umh.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
2020-05-15 13:48:59 -07:00
up.c
smp/up: Make smp_call_function_single() match SMP semantics
2020-02-07 15:34:12 +01:00
user_namespace.c
nsproxy: add struct nsset
2020-05-09 13:57:12 +02:00
user-return-notifier.c
…
user.c
user.c: make uidhash_table static
2020-06-04 19:06:24 -07:00
utsname_sysctl.c
sysctl: pass kernel pointers to ->proc_handler
2020-04-27 02:07:40 -04:00
utsname.c
nsproxy: add struct nsset
2020-05-09 13:57:12 +02:00
watch_queue.c
Notifications over pipes + Keyring notifications
2020-06-13 09:56:21 -07:00
watchdog_hld.c
…
watchdog.c
kernel/watchdog.c: convert {soft/hard}lockup boot parameters to sysctl aliases
2020-06-08 11:05:56 -07:00
workqueue_internal.h
…
workqueue.c
maccess: rename probe_kernel_{read,write} to copy_{from,to}_kernel_nofault
2020-06-17 10:57:41 -07:00