Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tools: ynl: Fix genlmsg header encoding formats

The pack strings use 'b' signed char for cmd and version but struct
genlmsghdr defines them as unsigned char. Use 'B' instead.

Fixes: 4e4480e89c47 ("tools: ynl: move the cli and netlink code around")
Signed-off-by: Donald Hunter <donald.hunter@gmail.com>
Link: https://lore.kernel.org/r/20230319193803.97453-1-donald.hunter@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Donald Hunter and committed by
Jakub Kicinski
758d29fb c79493c3

+3 -3
+3 -3
tools/net/ynl/lib/ynl.py
··· 200 200 if seq is None: 201 201 seq = random.randint(1, 1024) 202 202 nlmsg = struct.pack("HHII", nl_type, nl_flags, seq, 0) 203 - genlmsg = struct.pack("bbH", genl_cmd, genl_version, 0) 203 + genlmsg = struct.pack("BBH", genl_cmd, genl_version, 0) 204 204 return nlmsg + genlmsg 205 205 206 206 ··· 264 264 self.hdr = nl_msg.raw[0:4] 265 265 self.raw = nl_msg.raw[4:] 266 266 267 - self.genl_cmd, self.genl_version, _ = struct.unpack("bbH", self.hdr) 267 + self.genl_cmd, self.genl_version, _ = struct.unpack("BBH", self.hdr) 268 268 269 269 self.raw_attrs = NlAttrs(self.raw) 270 270 ··· 358 358 raw >>= 1 359 359 i += 1 360 360 else: 361 - value = enum['entries'][raw - i] 361 + value = enum.entries_by_val[raw - i].name 362 362 rsp[attr_spec['name']] = value 363 363 364 364 def _decode(self, attrs, space):