From: Jakub Kicinski <kuba@kernel.org>
Date: Sat, 20 Apr 2024 02:08:26 +0000 (-0700)
Subject: tools: ynl: don't ignore errors in NLMSG_DONE messages
X-Git-Tag: v6.6.30~129
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6a65f015ee4850f588b1afe9e82569a736a4e696;p=thirdparty%2Fkernel%2Fstable.git

tools: ynl: don't ignore errors in NLMSG_DONE messages

[ Upstream commit a44f2eb106a46f2275a79de54ce0ea63e4f3d8c8 ]

NLMSG_DONE contains an error code, it has to be extracted.
Prior to this change all dumps will end in success,
and in case of failure the result is silently truncated.

Fixes: e4b48ed460d3 ("tools: ynl: add a completely generic client")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Reviewed-by: Donald Hunter <donald.hunter@gmail.com>
Link: https://lore.kernel.org/r/20240420020827.3288615-1-kuba@kernel.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/tools/net/ynl/lib/ynl.py b/tools/net/ynl/lib/ynl.py
index 13c4b019a881f..44ea0965c9d9c 100644
--- a/tools/net/ynl/lib/ynl.py
+++ b/tools/net/ynl/lib/ynl.py
@@ -201,6 +201,7 @@ class NlMsg:
             self.done = 1
             extack_off = 20
         elif self.nl_type == Netlink.NLMSG_DONE:
+            self.error = struct.unpack("i", self.raw[0:4])[0]
             self.done = 1
             extack_off = 4