| From 694e6baad3988f75a8b859c8f39fb7dcdbfffe3a Mon Sep 17 00:00:00 2001 |
| From: Eric Dumazet <edumazet@google.com> |
| Date: Mon, 24 Sep 2012 07:00:11 +0000 |
| Subject: net: guard tcp_set_keepalive() to tcp sockets |
| |
| |
| From: Eric Dumazet <edumazet@google.com> |
| |
| [ 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| net/core/sock.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/net/core/sock.c |
| +++ b/net/core/sock.c |
| @@ -636,7 +636,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); |
