projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[firefly-linux-kernel-4.4.55.git]
/
net
/
ipv4
/
tcp_input.c
diff --git
a/net/ipv4/tcp_input.c
b/net/ipv4/tcp_input.c
index 88fa2d1606859de25419d0d45c3095f6d410d42b..d107ee246a1d32703ccc260309d52c3493927862 100644
(file)
--- a/
net/ipv4/tcp_input.c
+++ b/
net/ipv4/tcp_input.c
@@
-5231,7
+5231,7
@@
slow_path:
if (len < (th->doff << 2) || tcp_checksum_complete_user(sk, skb))
goto csum_error;
if (len < (th->doff << 2) || tcp_checksum_complete_user(sk, skb))
goto csum_error;
- if (!th->ack && !th->rst)
+ if (!th->ack && !th->rst
&& !th->syn
)
goto discard;
/*
goto discard;
/*
@@
-5650,7
+5650,7
@@
int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
goto discard;
}
goto discard;
}
- if (!th->ack && !th->rst)
+ if (!th->ack && !th->rst
&& !th->syn
)
goto discard;
if (!tcp_validate_incoming(sk, skb, th, 0))
goto discard;
if (!tcp_validate_incoming(sk, skb, th, 0))