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

Configure Feed

Select the types of activity you want to include in your feed.

tools: ynl-gen: use big-endian netlink attribute types

Change ynl-gen-c.py to use NLA_BE16 and NLA_BE32 types to represent
big-endian u16 and u32 ynl types.

Doing this enables those attributes to have range checks applied, as
the validator will then convert to host endianness prior to validation.

The autogenerated kernel/uapi code have been regenerated by running:
./tools/net/ynl/ynl-regen.sh -f

This changes the policy types of the following attributes:

FOU_ATTR_PORT (NLA_U16 -> NLA_BE16)
FOU_ATTR_PEER_PORT (NLA_U16 -> NLA_BE16)
These two are used with nla_get_be16/nla_put_be16().

MPTCP_PM_ADDR_ATTR_ADDR4 (NLA_U32 -> NLA_BE32)
This one is used with nla_get_in_addr/nla_put_in_addr(),
which uses nla_get_be32/nla_put_be32().

IOWs the generated changes are AFAICT aligned with their implementations.

The generated userspace code remains identical, and have been verified
by comparing the output generated by the following command:
make -C tools/net/ynl/generated

Signed-off-by: Asbjørn Sloth Tønnesen <ast@fiberby.net>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20241017094704.3222173-1-ast@fiberby.net
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

authored by

Asbjørn Sloth Tønnesen and committed by
Paolo Abeni 867d13a7 66ffef35

+7 -4
+2 -2
net/ipv4/fou_nl.c
··· 12 12 13 13 /* Global operation policy for fou */ 14 14 const struct nla_policy fou_nl_policy[FOU_ATTR_IFINDEX + 1] = { 15 - [FOU_ATTR_PORT] = { .type = NLA_U16, }, 15 + [FOU_ATTR_PORT] = { .type = NLA_BE16, }, 16 16 [FOU_ATTR_AF] = { .type = NLA_U8, }, 17 17 [FOU_ATTR_IPPROTO] = { .type = NLA_U8, }, 18 18 [FOU_ATTR_TYPE] = { .type = NLA_U8, }, ··· 21 21 [FOU_ATTR_LOCAL_V6] = { .len = 16, }, 22 22 [FOU_ATTR_PEER_V4] = { .type = NLA_U32, }, 23 23 [FOU_ATTR_PEER_V6] = { .len = 16, }, 24 - [FOU_ATTR_PEER_PORT] = { .type = NLA_U16, }, 24 + [FOU_ATTR_PEER_PORT] = { .type = NLA_BE16, }, 25 25 [FOU_ATTR_IFINDEX] = { .type = NLA_S32, }, 26 26 }; 27 27
+1 -1
net/mptcp/mptcp_pm_gen.c
··· 14 14 const struct nla_policy mptcp_pm_address_nl_policy[MPTCP_PM_ADDR_ATTR_IF_IDX + 1] = { 15 15 [MPTCP_PM_ADDR_ATTR_FAMILY] = { .type = NLA_U16, }, 16 16 [MPTCP_PM_ADDR_ATTR_ID] = { .type = NLA_U8, }, 17 - [MPTCP_PM_ADDR_ATTR_ADDR4] = { .type = NLA_U32, }, 17 + [MPTCP_PM_ADDR_ATTR_ADDR4] = { .type = NLA_BE32, }, 18 18 [MPTCP_PM_ADDR_ATTR_ADDR6] = NLA_POLICY_EXACT_LEN(16), 19 19 [MPTCP_PM_ADDR_ATTR_PORT] = { .type = NLA_U16, }, 20 20 [MPTCP_PM_ADDR_ATTR_FLAGS] = { .type = NLA_U32, },
+4 -1
tools/net/ynl/ynl-gen-c.py
··· 167 167 return '{ .type = ' + policy + ', }' 168 168 169 169 def attr_policy(self, cw): 170 - policy = c_upper('nla-' + self.attr['type']) 170 + policy = f'NLA_{c_upper(self.type)}' 171 + if self.attr.get('byte-order') == 'big-endian': 172 + if self.type in {'u16', 'u32'}: 173 + policy = f'NLA_BE{self.type[1:]}' 171 174 172 175 spec = self._attr_policy(policy) 173 176 cw.p(f"\t[{self.enum_name}] = {spec},")