projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tcp: Fix MD5 signature checking on IPv4 mapped sockets
[deliverable/linux.git]
/
net
/
ipv4
/
tcp_output.c
diff --git
a/net/ipv4/tcp_output.c
b/net/ipv4/tcp_output.c
index 416fc4c2e7ebdc7367959407ef99c386d6428c20..bd62712848fad8f1a116364002c23cfab903d49e 100644
(file)
--- a/
net/ipv4/tcp_output.c
+++ b/
net/ipv4/tcp_output.c
@@
-725,7
+725,8
@@
static void tcp_queue_skb(struct sock *sk, struct sk_buff *skb)
static void tcp_set_skb_tso_segs(struct sock *sk, struct sk_buff *skb,
unsigned int mss_now)
{
static void tcp_set_skb_tso_segs(struct sock *sk, struct sk_buff *skb,
unsigned int mss_now)
{
- if (skb->len <= mss_now || !sk_can_gso(sk)) {
+ if (skb->len <= mss_now || !sk_can_gso(sk) ||
+ skb->ip_summed == CHECKSUM_NONE) {
/* Avoid the costly divide in the normal
* non-TSO case.
*/
/* Avoid the costly divide in the normal
* non-TSO case.
*/
@@
-2260,7
+2261,7
@@
struct sk_buff *tcp_make_synack(struct sock *sk, struct dst_entry *dst,
#ifdef CONFIG_TCP_MD5SIG
/* Okay, we have all we need - do the md5 hash if needed */
if (md5) {
#ifdef CONFIG_TCP_MD5SIG
/* Okay, we have all we need - do the md5 hash if needed */
if (md5) {
- t
p
->af_specific->calc_md5_hash(md5_hash_location,
+ t
cp_rsk(req)
->af_specific->calc_md5_hash(md5_hash_location,
md5, NULL, req, skb);
}
#endif
md5, NULL, req, skb);
}
#endif
This page took
0.03324 seconds
and
5
git commands to generate.