Commit 3b4929f6 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

tcp: limit payload size of sacked skbs 



Jonathan Looney reported that TCP can trigger the following crash
in tcp_shifted_skb() :

	BUG_ON(tcp_skb_pcount(skb) < pcount);

This can happen if the remote peer has advertized the smallest
MSS that linux TCP accepts : 48

An skb can hold 17 fragments, and each fragment can hold 32KB
on x86, or 64KB on PowerPC.

This means that the 16bit witdh of TCP_SKB_CB(skb)->tcp_gso_segs
can overflow.

Note that tcp_sendmsg() builds skbs with less than 64KB
of payload, so this problem needs SACK to be enabled.
SACK blocks allow TCP to coalesce multiple skbs in the retransmit
queue, thus filling the 17 fragments to maximal capacity.

CVE-2019-11477 -- u16 overflow of TCP_SKB_CB(skb)->tcp_gso_segs

Fixes: 832d11c5 ("tcp: Try to restore large SKBs while SACK processing")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reported-by: default avatarJonathan Looney <jtl@netflix.com>
Acked-by: default avatarNeal Cardwell <ncardwell@google.com>
Reviewed-by: default avatarTyler Hicks <tyhicks@canonical.com>
Cc: Yuchung Cheng <ycheng@google.com>
Cc: Bruce Curtis <brucec@netflix.com>
Cc: Jonathan Lemon <jonathan.lemon@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1eb4169c

include/linux/tcp.h

+4 −0
Original line number Diff line number Diff line
@@ -484,4 +484,8 @@ static inline u16 tcp_mss_clamp(const struct tcp_sock *tp, u16 mss) 


	return (user_mss && user_mss < mss) ? user_mss : mss;

}



int tcp_skb_shift(struct sk_buff *to, struct sk_buff *from, int pcount,

		  int shiftlen);



#endif	/* _LINUX_TCP_H */

include/net/tcp.h

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ void tcp_time_wait(struct sock *sk, int state, int timeo); 


#define MAX_TCP_HEADER	(128 + MAX_HEADER)

#define MAX_TCP_OPTION_SPACE 40

#define TCP_MIN_SND_MSS		48

#define TCP_MIN_GSO_SIZE	(TCP_MIN_SND_MSS - MAX_TCP_OPTION_SPACE)



/*

 * Never offer a window over 32767 without using window scaling. Some

net/ipv4/tcp.c

+1 −0
Original line number Diff line number Diff line
@@ -3868,6 +3868,7 @@ void __init tcp_init(void) 
	unsigned long limit;

	unsigned int i;



	BUILD_BUG_ON(TCP_MIN_SND_MSS <= MAX_TCP_OPTION_SPACE);

	BUILD_BUG_ON(sizeof(struct tcp_skb_cb) >

		     FIELD_SIZEOF(struct sk_buff, cb));

net/ipv4/tcp_input.c

+20 −6
Original line number Diff line number Diff line
@@ -1302,7 +1302,7 @@ static bool tcp_shifted_skb(struct sock *sk, struct sk_buff *prev, 
	TCP_SKB_CB(skb)->seq += shifted;



	tcp_skb_pcount_add(prev, pcount);

	BUG_ON(tcp_skb_pcount(skb) < pcount);

	WARN_ON_ONCE(tcp_skb_pcount(skb) < pcount);

	tcp_skb_pcount_add(skb, -pcount);



	/* When we're adding to gso_segs == 1, gso_size will be zero,
@@ -1368,6 +1368,21 @@ static int skb_can_shift(const struct sk_buff *skb) 
	return !skb_headlen(skb) && skb_is_nonlinear(skb);

}



int tcp_skb_shift(struct sk_buff *to, struct sk_buff *from,

		  int pcount, int shiftlen)

{

	/* TCP min gso_size is 8 bytes (TCP_MIN_GSO_SIZE)

	 * Since TCP_SKB_CB(skb)->tcp_gso_segs is 16 bits, we need

	 * to make sure not storing more than 65535 * 8 bytes per skb,

	 * even if current MSS is bigger.

	 */

	if (unlikely(to->len + shiftlen >= 65535 * TCP_MIN_GSO_SIZE))

		return 0;

	if (unlikely(tcp_skb_pcount(to) + pcount > 65535))

		return 0;

	return skb_shift(to, from, shiftlen);

}



/* Try collapsing SACK blocks spanning across multiple skbs to a single

 * skb.

 */
@@ -1473,7 +1488,7 @@ static struct sk_buff *tcp_shift_skb_data(struct sock *sk, struct sk_buff *skb, 
	if (!after(TCP_SKB_CB(skb)->seq + len, tp->snd_una))

		goto fallback;



	if (!skb_shift(prev, skb, len))

	if (!tcp_skb_shift(prev, skb, pcount, len))

		goto fallback;

	if (!tcp_shifted_skb(sk, prev, skb, state, pcount, len, mss, dup_sack))

		goto out;
@@ -1491,11 +1506,10 @@ static struct sk_buff *tcp_shift_skb_data(struct sock *sk, struct sk_buff *skb, 
		goto out;



	len = skb->len;

	if (skb_shift(prev, skb, len)) {

		pcount += tcp_skb_pcount(skb);

		tcp_shifted_skb(sk, prev, skb, state, tcp_skb_pcount(skb),

	pcount = tcp_skb_pcount(skb);

	if (tcp_skb_shift(prev, skb, pcount, len))

		tcp_shifted_skb(sk, prev, skb, state, pcount,

				len, mss, 0);

	}



out:

	return prev;

net/ipv4/tcp_output.c

+3 −3
Original line number Diff line number Diff line
@@ -1454,8 +1454,8 @@ static inline int __tcp_mtu_to_mss(struct sock *sk, int pmtu) 
	mss_now -= icsk->icsk_ext_hdr_len;



	/* Then reserve room for full set of TCP options and 8 bytes of data */

	if (mss_now < 48)

		mss_now = 48;

	if (mss_now < TCP_MIN_SND_MSS)

		mss_now = TCP_MIN_SND_MSS;

	return mss_now;

}
@@ -2747,7 +2747,7 @@ static bool tcp_collapse_retrans(struct sock *sk, struct sk_buff *skb) 
		if (next_skb_size <= skb_availroom(skb))

			skb_copy_bits(next_skb, 0, skb_put(skb, next_skb_size),

				      next_skb_size);

		else if (!skb_shift(skb, next_skb, next_skb_size))

		else if (!tcp_skb_shift(skb, next_skb, 1, next_skb_size))

			return false;

	}

	tcp_highest_sack_replace(sk, next_skb, skb);

CRA Git | Maintained and supported by SUSTech CRA and CCSE