Unverified Commit 83af3495 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12641 tcp: check skb is non-NULL in tcp_rto_delta_us() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Jian <liujian56@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/JKO2PIDMRFGMLGPXFUNLE7YHAYNMMQP6/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAYPK1 
 
Link:https://gitee.com/openeuler/kernel/pulls/12641

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 6e98d0d8 74afb0e5

include/net/tcp.h

+19 −2
Original line number Diff line number Diff line
@@ -2118,9 +2118,26 @@ static inline s64 tcp_rto_delta_us(const struct sock *sk) 
{

	const struct sk_buff *skb = tcp_rtx_queue_head(sk);

	u32 rto = inet_csk(sk)->icsk_rto;



	if (likely(skb)) {

		u64 rto_time_stamp_us = tcp_skb_timestamp_us(skb) + jiffies_to_usecs(rto);



		return rto_time_stamp_us - tcp_sk(sk)->tcp_mstamp;

	} else {

		WARN_ONCE(1,

			"rtx queue emtpy: "

			"out:%u sacked:%u lost:%u retrans:%u "

			"tlp_high_seq:%u sk_state:%u ca_state:%u "

			"advmss:%u mss_cache:%u pmtu:%u\n",

			tcp_sk(sk)->packets_out, tcp_sk(sk)->sacked_out,

			tcp_sk(sk)->lost_out, tcp_sk(sk)->retrans_out,

			tcp_sk(sk)->tlp_high_seq, sk->sk_state,

			inet_csk(sk)->icsk_ca_state,

			tcp_sk(sk)->advmss, tcp_sk(sk)->mss_cache,

			inet_csk(sk)->icsk_pmtu_cookie);

		return jiffies_to_usecs(rto);

	}



}



/*