From 3dcc2f0a1179d56deb13ef5b98d56858dd04588b Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Fri, 2 Dec 2011 23:41:42 +0000
Subject: [PATCH] --- yaml --- r: 278339 b: refs/heads/master c:
 fdf5af0daf8019cec2396cdef8fb042d80fe71fa h: refs/heads/master i:   278337:
 35797c3b5f84782ba7c79ab544b697d14dbfc646   278335:
 2792e9984619bb0437d32ddaccf1388be301da60 v: v3

---
 [refs]                     | 2 +-
 trunk/net/ipv4/tcp_input.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index bf236c1bbbda..380e4adaaa82 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78a8a36fe0b2cee5a0a7360107815cbcad5b4003
+refs/heads/master: fdf5af0daf8019cec2396cdef8fb042d80fe71fa
diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
index 78dd38cd5496..0cbb44076cfa 100644
--- a/trunk/net/ipv4/tcp_input.c
+++ b/trunk/net/ipv4/tcp_input.c
@@ -5811,6 +5811,8 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
 			goto discard;
 
 		if (th->syn) {
+			if (th->fin)
+				goto discard;
 			if (icsk->icsk_af_ops->conn_request(sk, skb) < 0)
 				return 1;