diff options
| author | David S. Miller <davem@davemloft.net> | 2020-10-04 00:18:29 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-10-04 00:18:29 +0300 |
| commit | 186e26eb139a601359a7dcf722d6a39c683824cc (patch) | |
| tree | 292af9635b3bb0714677337afc0effaff69d0406 /include | |
| parent | 678cdd4967081b3035027b346d10f6f38bf367d2 (diff) | |
| parent | e992a6eda9a1eeeab73a8d2792464e4a2b1ebc3b (diff) | |
| download | linux-186e26eb139a601359a7dcf722d6a39c683824cc.tar.xz | |
Merge branch 'genetlink-per-op-policy-export'
Johannes Berg says:
====================
genetlink per-op policy export
Here's a respin, now including Jakub's patch last so that it will
do the right thing from the start.
The first patch remains the same, of course; the others have mostly
some rebasing going on, except for the actual export patch (patch 4)
which is adjusted per Jakub's review comments about exporting the
policy only if it's actually used for do/dump.
To see that, the dump for "nlctrl" (i.e. the generic netlink control)
is instructive, because the ops are this:
{
.cmd = CTRL_CMD_GETFAMILY,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
.policy = ctrl_policy_family,
.maxattr = ARRAY_SIZE(ctrl_policy_family) - 1,
.doit = ctrl_getfamily,
.dumpit = ctrl_dumpfamily,
},
{
.cmd = CTRL_CMD_GETPOLICY,
.policy = ctrl_policy_policy,
.maxattr = ARRAY_SIZE(ctrl_policy_policy) - 1,
.start = ctrl_dumppolicy_start,
.dumpit = ctrl_dumppolicy,
.done = ctrl_dumppolicy_done,
},
So we exercise both "don't have doit" and "GENL_DONT_VALIDATE_DUMP"
parts, and get (with the current genl patch):
$ genl ctrl policy name nlctrl
ID: 0x10 op 3 policies: do=0
ID: 0x10 op 10 policies: dump=1
ID: 0x10 policy[0]:attr[1]: type=U16 range:[0,65535]
ID: 0x10 policy[0]:attr[2]: type=NUL_STRING max len:15
ID: 0x10 policy[1]:attr[1]: type=U16 range:[0,65535]
ID: 0x10 policy[1]:attr[2]: type=NUL_STRING max len:15
ID: 0x10 policy[1]:attr[10]: type=U32 range:[0,4294967295]
====================
Reviewed-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/netlink.h | 9 | ||||
| -rw-r--r-- | include/uapi/linux/genetlink.h | 11 |
2 files changed, 17 insertions, 3 deletions
diff --git a/include/net/netlink.h b/include/net/netlink.h index 00258590f2cb..5a5ff97cc596 100644 --- a/include/net/netlink.h +++ b/include/net/netlink.h @@ -1937,9 +1937,12 @@ void nla_get_range_signed(const struct nla_policy *pt, struct netlink_policy_dump_state; -int netlink_policy_dump_start(const struct nla_policy *policy, - unsigned int maxtype, - struct netlink_policy_dump_state **state); +int netlink_policy_dump_add_policy(struct netlink_policy_dump_state **pstate, + const struct nla_policy *policy, + unsigned int maxtype); +int netlink_policy_dump_get_policy_idx(struct netlink_policy_dump_state *state, + const struct nla_policy *policy, + unsigned int maxtype); bool netlink_policy_dump_loop(struct netlink_policy_dump_state *state); int netlink_policy_dump_write(struct sk_buff *skb, struct netlink_policy_dump_state *state); diff --git a/include/uapi/linux/genetlink.h b/include/uapi/linux/genetlink.h index 9c0636ec2286..d83f214b4134 100644 --- a/include/uapi/linux/genetlink.h +++ b/include/uapi/linux/genetlink.h @@ -64,6 +64,8 @@ enum { CTRL_ATTR_OPS, CTRL_ATTR_MCAST_GROUPS, CTRL_ATTR_POLICY, + CTRL_ATTR_OP_POLICY, + CTRL_ATTR_OP, __CTRL_ATTR_MAX, }; @@ -85,6 +87,15 @@ enum { __CTRL_ATTR_MCAST_GRP_MAX, }; +enum { + CTRL_ATTR_POLICY_UNSPEC, + CTRL_ATTR_POLICY_DO, + CTRL_ATTR_POLICY_DUMP, + + __CTRL_ATTR_POLICY_DUMP_MAX, + CTRL_ATTR_POLICY_DUMP_MAX = __CTRL_ATTR_POLICY_DUMP_MAX - 1 +}; + #define CTRL_ATTR_MCAST_GRP_MAX (__CTRL_ATTR_MCAST_GRP_MAX - 1) |