af_unix: Disable MSG_OOB handling for sockets in sockmap/sockhash
authorMichal Luczaj <mhal@rbox.co>
Sat, 13 Jul 2024 19:41:38 +0000 (21:41 +0200)
committerDaniel Borkmann <daniel@iogearbox.net>
Wed, 17 Jul 2024 20:49:00 +0000 (22:49 +0200)
commit638f32604385fd23059985da8de918e9c18f0b98
tree0359b72764f0b588b15cf7f4d11bc0d89fb79ed1
parent3c870059e9f8897c032f4256f90c41ee822218a8
af_unix: Disable MSG_OOB handling for sockets in sockmap/sockhash

AF_UNIX socket tracks the most recent OOB packet (in its receive queue)
with an `oob_skb` pointer. BPF redirecting does not account for that: when
an OOB packet is moved between sockets, `oob_skb` is left outdated. This
results in a single skb that may be accessed from two different sockets.

Take the easy way out: silently drop MSG_OOB data targeting any socket that
is in a sockmap or a sockhash. Note that such silent drop is akin to the
fate of redirected skb's scm_fp_list (SCM_RIGHTS, SCM_CREDENTIALS).

For symmetry, forbid MSG_OOB in unix_bpf_recvmsg().

Fixes: 314001f0bf92 ("af_unix: Add OOB support")
Suggested-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: Michal Luczaj <mhal@rbox.co>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Tested-by: Jakub Sitnicki <jakub@cloudflare.com>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: Jakub Sitnicki <jakub@cloudflare.com>
Link: https://lore.kernel.org/bpf/20240713200218.2140950-2-mhal@rbox.co
net/unix/af_unix.c
net/unix/unix_bpf.c