diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 13:59:08 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 13:59:08 -0400 |
| commit | 79d49360b142a40aec91519965f8ccab032a7f98 (patch) | |
| tree | a1455e9025968e141baa27b32645f85f5000adab | |
| parent | fe3c76f1c5ba56c1d7786c2b6aaa8409c85785dd (diff) | |
| download | longterm-queue-4.12-79d49360b142a40aec91519965f8ccab032a7f98.tar.gz | |
tcp: refresh ctxt
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/tcp-md5sig-Use-skb-s-saddr-when-replying-to-an-incom.patch | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/queue/tcp-md5sig-Use-skb-s-saddr-when-replying-to-an-incom.patch b/queue/tcp-md5sig-Use-skb-s-saddr-when-replying-to-an-incom.patch index 872af43..acbddd8 100644 --- a/queue/tcp-md5sig-Use-skb-s-saddr-when-replying-to-an-incom.patch +++ b/queue/tcp-md5sig-Use-skb-s-saddr-when-replying-to-an-incom.patch @@ -1,4 +1,4 @@ -From 30791ac41927ebd3e75486f9504b6d2280463bf0 Mon Sep 17 00:00:00 2001 +From abd3247a1fb397d1ef53d2748147e19d4066912d Mon Sep 17 00:00:00 2001 From: Christoph Paasch <cpaasch@apple.com> Date: Mon, 11 Dec 2017 00:05:46 -0800 Subject: [PATCH] tcp md5sig: Use skb's saddr when replying to an incoming @@ -23,13 +23,14 @@ Fixes: 9501f9722922 ("tcp md5sig: Let the caller pass appropriate key for tcp_v{ Signed-off-by: Christoph Paasch <cpaasch@apple.com> Reviewed-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c -index 77ea45da0fe9..94e28350f420 100644 +index 71661dbd66cb..9f1d89367cac 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c -@@ -848,7 +848,7 @@ static void tcp_v4_reqsk_send_ack(const struct sock *sk, struct sk_buff *skb, - tcp_time_stamp_raw() + tcp_rsk(req)->ts_off, +@@ -843,7 +843,7 @@ static void tcp_v4_reqsk_send_ack(const struct sock *sk, struct sk_buff *skb, + tcp_time_stamp + tcp_rsk(req)->ts_off, req->ts_recent, 0, - tcp_md5_do_lookup(sk, (union tcp_md5_addr *)&ip_hdr(skb)->daddr, @@ -38,12 +39,12 @@ index 77ea45da0fe9..94e28350f420 100644 inet_rsk(req)->no_srccheck ? IP_REPLY_ARG_NOSRCCHECK : 0, ip_hdr(skb)->tos); diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c -index 1f04ec0e4a7a..7178476b3d2f 100644 +index 197c4624fb96..543effe0bb02 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c -@@ -994,7 +994,7 @@ static void tcp_v6_reqsk_send_ack(const struct sock *sk, struct sk_buff *skb, +@@ -973,7 +973,7 @@ static void tcp_v6_reqsk_send_ack(const struct sock *sk, struct sk_buff *skb, req->rsk_rcv_wnd >> inet_rsk(req)->rcv_wscale, - tcp_time_stamp_raw() + tcp_rsk(req)->ts_off, + tcp_time_stamp + tcp_rsk(req)->ts_off, req->ts_recent, sk->sk_bound_dev_if, - tcp_v6_md5_do_lookup(sk, &ipv6_hdr(skb)->daddr), + tcp_v6_md5_do_lookup(sk, &ipv6_hdr(skb)->saddr), |