diff options
| author | Tom Herbert <tom@quantonium.net> | 2018-01-24 12:35:40 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-24 15:54:30 -0500 |
| commit | 581e7226a5d43f629eb6399a121f85f6a15f81be (patch) | |
| tree | bf1dde342aff9c631a516f2fc67525f2d1c283ee /net/kcm | |
| parent | d3303a65a00c94372ddab831570647488e6c06e2 (diff) | |
| download | linux-stable-581e7226a5d43f629eb6399a121f85f6a15f81be.tar.gz linux-stable-581e7226a5d43f629eb6399a121f85f6a15f81be.tar.bz2 linux-stable-581e7226a5d43f629eb6399a121f85f6a15f81be.zip | |
kcm: Only allow TCP sockets to be attached to a KCM mux
TCP sockets for IPv4 and IPv6 that are not listeners or in closed
stated are allowed to be attached to a KCM mux.
Fixes: ab7ac4eb9832 ("kcm: Kernel Connection Multiplexor module")
Reported-by: syzbot+8865eaff7f9acd593945@syzkaller.appspotmail.com
Signed-off-by: Tom Herbert <tom@quantonium.net>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/kcm')
| -rw-r--r-- | net/kcm/kcmsock.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c index d4e98f20fc2a..7632797fb68e 100644 --- a/net/kcm/kcmsock.c +++ b/net/kcm/kcmsock.c @@ -1387,8 +1387,13 @@ static int kcm_attach(struct socket *sock, struct socket *csock, if (!csk) return -EINVAL; - /* We must prevent loops or risk deadlock ! */ - if (csk->sk_family == PF_KCM) + /* Only allow TCP sockets to be attached for now */ + if ((csk->sk_family != AF_INET && csk->sk_family != AF_INET6) || + csk->sk_protocol != IPPROTO_TCP) + return -EOPNOTSUPP; + + /* Don't allow listeners or closed sockets */ + if (csk->sk_state == TCP_LISTEN || csk->sk_state == TCP_CLOSE) return -EOPNOTSUPP; psock = kmem_cache_zalloc(kcm_psockp, GFP_KERNEL); |