Unverified Commit 8e8fd59e authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9270 inet_diag: fix kernel-infoleak for UDP sockets 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhengchao Shao <shaozhengchao@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/RJGNQGMUUGWTFOE6VZXMTCX4QJWIDPX7/ 
 
https://gitee.com/src-openeuler/kernel/issues/IA6SGV 
 
Link:https://gitee.com/openeuler/kernel/pulls/9270

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 35ecdbbf 8924d1d2

net/ipv4/inet_diag.c

+1 −3
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk, 
	r->idiag_state = sk->sk_state;

	r->idiag_timer = 0;

	r->idiag_retrans = 0;

	r->idiag_expires = 0;



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

		goto errout;
@@ -255,9 +256,6 @@ int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk, 
		r->idiag_retrans = icsk->icsk_probes_out;

		r->idiag_expires =

			jiffies_to_msecs(sk->sk_timer.expires - jiffies);

	} else {

		r->idiag_timer = 0;

		r->idiag_expires = 0;

	}



	if ((ext & (1 << (INET_DIAG_INFO - 1))) && handler->idiag_info_size) {