From c9cdb0d5b84b9d462de7b6b729ae9de4f014dfe6 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Thu, 10 Jan 2013 16:18:47 +0000 Subject: [PATCH] --- yaml --- r: 348627 b: refs/heads/master c: 7b514a886ba50e3b99295b00805f0d5ad750ca66 h: refs/heads/master i: 348625: 4dee31f3ea0f2bd15e20ceae35dfcf33a976688f 348623: 9210a0c015fca7a752fc64ba9925d2ce61218a5b v: v3 --- [refs] | 2 +- trunk/net/ipv4/tcp_input.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 96867e14e748..dcd502f9ca97 100644 --- 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 index a28e4db8a952..18f97ca76b00 100644 --- 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))