Commit 2b7cda9c authored Oct 30, 2017 by Eric Dumazet Committed by David S. Miller Nov 01, 2017

tcp: fix tcp_mtu_probe() vs highest_sack



Based on SNMP values provided by Roman, Yuchung made the observation
that some crashes in tcp_sacktag_walk() might be caused by MTU probing.

Looking at tcp_mtu_probe(), I found that when a new skb was placed
in front of the write queue, we were not updating tcp highest sack.

If one skb is freed because all its content was copied to the new skb
(for MTU probing), then tp->highest_sack could point to a now freed skb.

Bad things would then happen, including infinite loops.

This patch renames tcp_highest_sack_combine() and uses it
from tcp_mtu_probe() to fix the bug.

Note that I also removed one test against tp->sacked_out,
since we want to replace tp->highest_sack regardless of whatever
condition, since keeping a stale pointer to freed skb is a recipe
for disaster.

Fixes: a47e5a98 ("[TCP]: Convert highest_sack to sk_buff to allow direct access")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Reported-by: Roman Gushchin <guro@fb.com>
Reported-by: Oleksandr Natalenko <oleksandr@natalenko.name>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Neal Cardwell <ncardwell@google.com>
Acked-by: Yuchung Cheng <ycheng@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent e669b869

include/net/tcp.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -1771,12 +1771,12 @@ static inline void tcp_highest_sack_reset(struct sock *sk)
		tcp_sk(sk)->highest_sack = tcp_write_queue_head(sk);
		}

		/* Called when old skb is about to be deleted (to be combined with new skb) */
		static inline void tcp_highest_sack_combine(struct sock *sk,
		/* Called when old skb is about to be deleted and replaced by new skb */
		static inline void tcp_highest_sack_replace(struct sock *sk,
		struct sk_buff *old,
		struct sk_buff *new)
		{
		if (tcp_sk(sk)->sacked_out && (old == tcp_sk(sk)->highest_sack))
		if (old == tcp_highest_sack(sk))
		tcp_sk(sk)->highest_sack = new;
		}

net/ipv4/tcp_output.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2062,6 +2062,7 @@ static int tcp_mtu_probe(struct sock *sk)
		nskb->ip_summed = skb->ip_summed;

		tcp_insert_write_queue_before(nskb, skb, sk);
		tcp_highest_sack_replace(sk, skb, nskb);

		len = 0;
		tcp_for_write_queue_from_safe(skb, next, sk) {
		@@ -2665,7 +2666,7 @@ static bool tcp_collapse_retrans(struct sock sk, struct sk_buff skb)
		else if (!skb_shift(skb, next_skb, next_skb_size))
		return false;
		}
		tcp_highest_sack_combine(sk, next_skb, skb);
		tcp_highest_sack_replace(sk, next_skb, skb);

		tcp_unlink_write_queue(next_skb, sk);

Admin message