OSDN Git Service

bpf, unix: Check socket type in unix_bpf_update_proto()
authorCong Wang <cong.wang@bytedance.com>
Sat, 31 Jul 2021 19:50:38 +0000 (12:50 -0700)
committerDaniel Borkmann <daniel@iogearbox.net>
Tue, 3 Aug 2021 10:52:53 +0000 (12:52 +0200)
As of now, only AF_UNIX datagram socket supports sockmap. But
unix_proto is shared for all kinds of AF_UNIX sockets, so we
have to check the socket type in unix_bpf_update_proto() to
explicitly reject other types, otherwise they could be added
into sockmap, too.

Fixes: c63829182c37 ("af_unix: Implement ->psock_update_sk_prot()")
Reported-by: Jakub Sitnicki <jakub@cloudflare.com>
Signed-off-by: Cong Wang <cong.wang@bytedance.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Jakub Sitnicki <jakub@cloudflare.com>
Link: https://lore.kernel.org/bpf/20210731195038.8084-1-xiyou.wangcong@gmail.com
net/unix/unix_bpf.c

index 177e883..20f5357 100644 (file)
@@ -105,6 +105,9 @@ static void unix_bpf_check_needs_rebuild(struct proto *ops)
 
 int unix_bpf_update_proto(struct sock *sk, struct sk_psock *psock, bool restore)
 {
+       if (sk->sk_type != SOCK_DGRAM)
+               return -EOPNOTSUPP;
+
        if (restore) {
                sk->sk_write_space = psock->saved_write_space;
                WRITE_ONCE(sk->sk_prot, psock->sk_proto);