Skip to content

Commit 867d13a

Browse files
Asbjørn Sloth TønnesenPaolo Abeni
authored andcommitted
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 <[email protected]> Reviewed-by: Simon Horman <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Paolo Abeni <[email protected]>
1 parent 66ffef3 commit 867d13a

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

net/ipv4/fou_nl.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
/* Global operation policy for fou */
1414
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, },
1616
[FOU_ATTR_AF] = { .type = NLA_U8, },
1717
[FOU_ATTR_IPPROTO] = { .type = NLA_U8, },
1818
[FOU_ATTR_TYPE] = { .type = NLA_U8, },
@@ -21,7 +21,7 @@ const struct nla_policy fou_nl_policy[FOU_ATTR_IFINDEX + 1] = {
2121
[FOU_ATTR_LOCAL_V6] = { .len = 16, },
2222
[FOU_ATTR_PEER_V4] = { .type = NLA_U32, },
2323
[FOU_ATTR_PEER_V6] = { .len = 16, },
24-
[FOU_ATTR_PEER_PORT] = { .type = NLA_U16, },
24+
[FOU_ATTR_PEER_PORT] = { .type = NLA_BE16, },
2525
[FOU_ATTR_IFINDEX] = { .type = NLA_S32, },
2626
};
2727

net/mptcp/mptcp_pm_gen.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
const struct nla_policy mptcp_pm_address_nl_policy[MPTCP_PM_ADDR_ATTR_IF_IDX + 1] = {
1515
[MPTCP_PM_ADDR_ATTR_FAMILY] = { .type = NLA_U16, },
1616
[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, },
1818
[MPTCP_PM_ADDR_ATTR_ADDR6] = NLA_POLICY_EXACT_LEN(16),
1919
[MPTCP_PM_ADDR_ATTR_PORT] = { .type = NLA_U16, },
2020
[MPTCP_PM_ADDR_ATTR_FLAGS] = { .type = NLA_U32, },

tools/net/ynl/ynl-gen-c.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,10 @@ def _attr_policy(self, policy):
167167
return '{ .type = ' + policy + ', }'
168168

169169
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:]}'
171174

172175
spec = self._attr_policy(policy)
173176
cw.p(f"\t[{self.enum_name}] = {spec},")

0 commit comments

Comments
 (0)