diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-05 01:56:41 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-05 01:56:41 -0500 |
| commit | 469da62096e23adc755c1268b00b5fc7a214151b (patch) | |
| tree | fefd055fdae584e38d551f44d1339eb22cee4ed9 /net/ipv4/tcp_input.c | |
| parent | 4227961650884a06757f80877d5dce0bddc723d4 (diff) | |
| parent | 88b62b915b0b7e25870eb0604ed9a92ba4bfc9f7 (diff) | |
Merge tag 'v3.8-rc6' into next/soc
Linux 3.8-rc6
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index a28e4db8a952..18f97ca76b00 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
| @@ -5543,7 +5543,7 @@ slow_path: | |||
| 5543 | if (len < (th->doff << 2) || tcp_checksum_complete_user(sk, skb)) | 5543 | if (len < (th->doff << 2) || tcp_checksum_complete_user(sk, skb)) |
| 5544 | goto csum_error; | 5544 | goto csum_error; |
| 5545 | 5545 | ||
| 5546 | if (!th->ack) | 5546 | if (!th->ack && !th->rst) |
| 5547 | goto discard; | 5547 | goto discard; |
| 5548 | 5548 | ||
| 5549 | /* | 5549 | /* |
| @@ -5988,7 +5988,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb, | |||
| 5988 | goto discard; | 5988 | goto discard; |
| 5989 | } | 5989 | } |
| 5990 | 5990 | ||
| 5991 | if (!th->ack) | 5991 | if (!th->ack && !th->rst) |
| 5992 | goto discard; | 5992 | goto discard; |
| 5993 | 5993 | ||
| 5994 | if (!tcp_validate_incoming(sk, skb, th, 0)) | 5994 | if (!tcp_validate_incoming(sk, skb, th, 0)) |