summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2012-09-24 07:00:11 +0000
committerDavid S. Miller <davem@davemloft.net>2012-09-24 16:51:53 -0400
commit3e10986d1d698140747fcfc2761ec9cb64c1d582 (patch)
treeee37bd030acf7dce85c0a1866bab6700bc71d8f0 /net
parent69190e67d4fac49e2f6ea22f46780d0c712214b8 (diff)
downloadlinux-3e10986d1d698140747fcfc2761ec9cb64c1d582.tar.bz2
net: guard tcp_set_keepalive() to tcp sockets
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>
Diffstat (limited to 'net')
-rw-r--r--net/core/sock.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/sock.c b/net/core/sock.c
index 305792076121..a6000fbad294 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -691,7 +691,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);