Commit e33de7c5 authored by Wang Hai's avatar Wang Hai Committed by Jakub Kicinski
Browse files

inet_diag: Fix error path to cancel the meseage in inet_req_diag_fill() 



nlmsg_cancel() needs to be called in the error path of
inet_req_diag_fill to cancel the message.

Fixes: d545caca ("net: inet: diag: expose the socket mark to privileged processes.")
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarWang Hai <wanghai38@huawei.com>
Link: https://lore.kernel.org/r/20201116082018.16496-1-wanghai38@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 138559b9

net/ipv4/inet_diag.c

+3 −1
Original line number Diff line number Diff line
@@ -479,8 +479,10 @@ static int inet_req_diag_fill(struct sock *sk, struct sk_buff *skb, 
	r->idiag_inode	= 0;



	if (net_admin && nla_put_u32(skb, INET_DIAG_MARK,

				     inet_rsk(reqsk)->ir_mark))

				     inet_rsk(reqsk)->ir_mark)) {

		nlmsg_cancel(skb, nlh);

		return -EMSGSIZE;

	}



	nlmsg_end(skb, nlh);

	return 0;