diff options
| author | Chris Mason <clm@fb.com> | 2014-12-02 21:42:03 -0500 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2014-12-02 21:42:03 -0500 |
| commit | 9627aeee3e203e30679549e4962633698a6bf87f (patch) | |
| tree | 30ee313a7049bf3fcc17e346df5737e967fd9a95 /net/ipv4/tcp_input.c | |
| parent | cb83b7b81698a4abe531e0ba18b9e288b06947ce (diff) | |
| parent | 5d3edd8f44aac94de7b16f4c54290e24f5e8c532 (diff) | |
Merge branch 'raid56-scrub-replace' of git://github.com/miaoxie/linux-btrfs into for-linus
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 88fa2d160685..d107ee246a1d 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
| @@ -5231,7 +5231,7 @@ slow_path: | |||
| 5231 | if (len < (th->doff << 2) || tcp_checksum_complete_user(sk, skb)) | 5231 | if (len < (th->doff << 2) || tcp_checksum_complete_user(sk, skb)) |
| 5232 | goto csum_error; | 5232 | goto csum_error; |
| 5233 | 5233 | ||
| 5234 | if (!th->ack && !th->rst) | 5234 | if (!th->ack && !th->rst && !th->syn) |
| 5235 | goto discard; | 5235 | goto discard; |
| 5236 | 5236 | ||
| 5237 | /* | 5237 | /* |
| @@ -5650,7 +5650,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb, | |||
| 5650 | goto discard; | 5650 | goto discard; |
| 5651 | } | 5651 | } |
| 5652 | 5652 | ||
| 5653 | if (!th->ack && !th->rst) | 5653 | if (!th->ack && !th->rst && !th->syn) |
| 5654 | goto discard; | 5654 | goto discard; |
| 5655 | 5655 | ||
| 5656 | if (!tcp_validate_incoming(sk, skb, th, 0)) | 5656 | if (!tcp_validate_incoming(sk, skb, th, 0)) |