[PATCH AUTOSEL 5.15 35/36] devlink: health: Fix nla_nest_end in error flow

From: Sasha Levin
Date: Sun Feb 26 2023 - 09:56:57 EST


From: Moshe Shemesh <moshe@xxxxxxxxxx>

[ Upstream commit bfd4e6a5dbbc12f77620602e764ac940ccb159de ]

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@xxxxxxxxxx>
Reviewed-by: Jiri Pirko <jiri@xxxxxxxxxx>
Reviewed-by: Jakub Kicinski <kuba@xxxxxxxxxx>
Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
---
net/core/devlink.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/core/devlink.c b/net/core/devlink.c
index b4d7a7f749c18..e51a484087dab 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -6914,7 +6914,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;
--
2.39.0