diff options
| author | Eric Dumazet <edumazet@google.com> | 2012-09-24 07:00:11 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-10-10 03:31:31 +0100 |
| commit | 9a2ed90a493c0b955d973b25d81c78621e49af93 (patch) | |
| tree | b70980dea37e643bc70d29e23f0587951da3c8bd /net/core/sock.c | |
| parent | 0dda7b56c0b1341a01d9d4480f921f856007f88a (diff) | |
| download | kernel_samsung_smdk4412-9a2ed90a493c0b955d973b25d81c78621e49af93.zip kernel_samsung_smdk4412-9a2ed90a493c0b955d973b25d81c78621e49af93.tar.gz kernel_samsung_smdk4412-9a2ed90a493c0b955d973b25d81c78621e49af93.tar.bz2 | |
net: guard tcp_set_keepalive() to tcp sockets
[ Upstream commit 3e10986d1d698140747fcfc2761ec9cb64c1d582 ]
Its possible to use RAW sockets to get a crash in
tcp_set_keepalive() / sk_reset_timer()
Fix is to make sure socket is a SOCK_STREAM one.
Reported-by: Dave Jones <davej@redhat.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net/core/sock.c')
| -rw-r--r-- | net/core/sock.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 018fd41..1e8a882 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -593,7 +593,8 @@ set_rcvbuf: case SO_KEEPALIVE: #ifdef CONFIG_INET - if (sk->sk_protocol == IPPROTO_TCP) + if (sk->sk_protocol == IPPROTO_TCP && + sk->sk_type == SOCK_STREAM) tcp_set_keepalive(sk, valbool); #endif sock_valbool_flag(sk, SOCK_KEEPOPEN, valbool); |