Unverified Commit 08481d63 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10251 sctp: fix kernel-infoleak for SCTP sockets 

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

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents bd624ead c1f2a136

net/sctp/diag.c

+3 −6
Original line number Diff line number Diff line
@@ -76,10 +76,6 @@ static void inet_diag_msg_sctpasoc_fill(struct inet_diag_msg *r, 
		r->idiag_timer = SCTP_EVENT_TIMEOUT_T3_RTX;

		r->idiag_retrans = asoc->rtx_data_chunks;

		r->idiag_expires = jiffies_to_msecs(t3_rtx->expires - jiffies);

	} else {

		r->idiag_timer = 0;

		r->idiag_retrans = 0;

		r->idiag_expires = 0;

	}

}
@@ -159,13 +155,14 @@ static int inet_sctp_diag_fill(struct sock *sk, struct sctp_association *asoc, 
	r = nlmsg_data(nlh);

	BUG_ON(!sk_fullsock(sk));



	r->idiag_timer = 0;

	r->idiag_retrans = 0;

	r->idiag_expires = 0;

	if (asoc) {

		inet_diag_msg_sctpasoc_fill(r, sk, asoc);

	} else {

		inet_diag_msg_common_fill(r, sk);

		r->idiag_state = sk->sk_state;

		r->idiag_timer = 0;

		r->idiag_retrans = 0;

	}



	if (inet_diag_msg_attrs_fill(sk, skb, r, ext, user_ns, net_admin))