From: Moshe Shemesh <moshe@nvidia.com>
Date: Tue, 14 Feb 2023 16:37:58 +0000 (+0200)
Subject: devlink: health: Fix nla_nest_end in error flow
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bfd4e6a5dbbc12f77620602e764ac940ccb159de;p=linux.git

devlink: health: Fix nla_nest_end in error flow

devlink_nl_health_reporter_fill() error flow calls nla_nest_end(). Fix
it to call nla_nest_cancel() instead.

Note the bug is harmless as genlmsg_cancel() cancel the entire message,
so no fixes tag added.

Signed-off-by: Moshe Shemesh <moshe@nvidia.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Reviewed-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

diff --git a/net/devlink/leftover.c b/net/devlink/leftover.c
index cfd1b90a0fc19..90f95f06de28a 100644
--- a/net/devlink/leftover.c
+++ b/net/devlink/leftover.c
@@ -6028,7 +6028,7 @@ devlink_nl_health_reporter_fill(struct sk_buff *msg,
 	return 0;
 
 reporter_nest_cancel:
-	nla_nest_end(msg, reporter_attr);
+	nla_nest_cancel(msg, reporter_attr);
 genlmsg_cancel:
 	genlmsg_cancel(msg, hdr);
 	return -EMSGSIZE;