Commit f1555c9c authored Nov 16, 2020 by Wang Hai Committed by Greg Kroah-Hartman Nov 24, 2020

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



[ Upstream commit e33de7c5317e2827b2ba6fd120a505e9eb727b05 ]

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: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wang Hai <wanghai38@huawei.com>
Link: https://lore.kernel.org/r/20201116082018.16496-1-wanghai38@huawei.com


Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 138c1563

net/ipv4/inet_diag.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -355,8 +355,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;