summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorWang Hai <wanghai38@huawei.com>2020-11-16 09:20:18 +0100
committerJakub Kicinski <kuba@kernel.org>2020-11-18 01:08:36 +0100
commite33de7c5317e2827b2ba6fd120a505e9eb727b05 (patch)
tree007a281c9797d9377c3187441a777d079d11a70b /net
parentnet/tls: Fix wrong record sn in async mode of device resync (diff)
downloadlinux-e33de7c5317e2827b2ba6fd120a505e9eb727b05.tar.xz
linux-e33de7c5317e2827b2ba6fd120a505e9eb727b05.zip
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: d545caca827b ("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>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/inet_diag.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
index 366a4507b5a3..93474b1bea4e 100644
--- a/net/ipv4/inet_diag.c
+++ b/net/ipv4/inet_diag.c
@@ -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;