Unverified Commit 3dce4f55 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10231 fix CVE-2024-41007 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhengchao Shao <shaozhengchao@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/4ES3LEOQDCYT6U7V6HHMY3SH6RTZQNVU/ 
Fix CVE-2024-41007.

Eric Dumazet (2):
  tcp: use signed arithmetic in tcp_rtx_probe0_timed_out()
  tcp: avoid too many retransmit packets


-- 
2.34.1
 
https://gitee.com/src-openeuler/kernel/issues/IAD4B4 
 
Link:https://gitee.com/openeuler/kernel/pulls/10231

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents ce769115 d12ca3bd

net/ipv4/tcp_timer.c

+23 −6
Original line number Diff line number Diff line
@@ -457,17 +457,34 @@ static void tcp_fastopen_synack_timer(struct sock *sk, struct request_sock *req) 
static bool tcp_rtx_probe0_timed_out(const struct sock *sk,

				     const struct sk_buff *skb)

{

	const struct inet_connection_sock *icsk = inet_csk(sk);

	u32 user_timeout = READ_ONCE(icsk->icsk_user_timeout);

	const struct tcp_sock *tp = tcp_sk(sk);

	const int timeout = TCP_RTO_MAX * 2;

	u32 rcv_delta, rtx_delta;



	rcv_delta = inet_csk(sk)->icsk_timeout - tp->rcv_tstamp;

	if (rcv_delta <= timeout)

		return false;

	int timeout = TCP_RTO_MAX * 2;

	u32 rtx_delta;

	s32 rcv_delta;



	rtx_delta = (u32)msecs_to_jiffies(tcp_time_stamp(tp) -

			(tp->retrans_stamp ?: tcp_skb_timestamp(skb)));



	if (user_timeout) {

		/* If user application specified a TCP_USER_TIMEOUT,

		 * it does not want win 0 packets to 'reset the timer'

		 * while retransmits are not making progress.

		 */

		if (rtx_delta > user_timeout)

			return true;

		timeout = min_t(u32, timeout, msecs_to_jiffies(user_timeout));

	}



	/* Note: timer interrupt might have been delayed by at least one jiffy,

	 * and tp->rcv_tstamp might very well have been written recently.

	 * rcv_delta can thus be negative.

	 */

	rcv_delta = icsk->icsk_timeout - tp->rcv_tstamp;

	if (rcv_delta <= timeout)

		return false;



	return rtx_delta > timeout;

}