Skip to content

Commit e33de7c

Browse files
Wang Haikuba-moo
authored andcommitted
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: d545cac ("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>
1 parent 138559b commit e33de7c

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

net/ipv4/inet_diag.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,8 +479,10 @@ static int inet_req_diag_fill(struct sock *sk, struct sk_buff *skb,
479479
r->idiag_inode = 0;
480480

481481
if (net_admin && nla_put_u32(skb, INET_DIAG_MARK,
482-
inet_rsk(reqsk)->ir_mark))
482+
inet_rsk(reqsk)->ir_mark)) {
483+
nlmsg_cancel(skb, nlh);
483484
return -EMSGSIZE;
485+
}
484486

485487
nlmsg_end(skb, nlh);
486488
return 0;

0 commit comments

Comments
 (0)