---

yaml --- r: 348627 b: refs/heads/master c: 7b514a8 h: refs/heads/master i: 348625: 4dee31f 348623: 9210a0c v: v3
git-mirror · Jan 11, 2013 · c9cdb0d · c9cdb0d
1 parent 421b653
commit c9cdb0d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb59c87dbc8be2ffa692c50bd22f89025ba7a342
+refs/heads/master: 7b514a886ba50e3b99295b00805f0d5ad750ca66
diff --git a/trunk/net/ipv4/tcp_input.c b/trunk/net/ipv4/tcp_input.c
@@ -5543,7 +5543,7 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
 	if (len < (th->doff << 2) || tcp_checksum_complete_user(sk, skb))
 		goto csum_error;
 
-	if (!th->ack)
+	if (!th->ack && !th->rst)
 		goto discard;
 
 	/*
@@ -5988,7 +5988,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
 			goto discard;
 	}
 
-	if (!th->ack)
+	if (!th->ack && !th->rst)
 		goto discard;
 
 	if (!tcp_validate_incoming(sk, skb, th, 0))