Commit 643d0878 authored by Petr Machata's avatar Petr Machata Committed by Jakub Kicinski

nexthop: Specialize rtm_nh_policy

This policy is currently only used for creation of new next hops and new
next hop groups. Rename it accordingly and remove the two attributes that
are not valid in that context: NHA_GROUPS and NHA_MASTER.

For consistency with other policies, do not mention policy array size in
the declarator, and replace NHA_MAX for ARRAY_SIZE as appropriate.

Note that with this commit, NHA_MAX and __NHA_MAX are not used anymore.
Leave them in purely as a user API.
Signed-off-by: default avatarPetr Machata <petrm@nvidia.com>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 44551bff
...@@ -22,7 +22,7 @@ static void remove_nexthop(struct net *net, struct nexthop *nh, ...@@ -22,7 +22,7 @@ static void remove_nexthop(struct net *net, struct nexthop *nh,
#define NH_DEV_HASHBITS 8 #define NH_DEV_HASHBITS 8
#define NH_DEV_HASHSIZE (1U << NH_DEV_HASHBITS) #define NH_DEV_HASHSIZE (1U << NH_DEV_HASHBITS)
static const struct nla_policy rtm_nh_policy[NHA_MAX + 1] = { static const struct nla_policy rtm_nh_policy_new[] = {
[NHA_ID] = { .type = NLA_U32 }, [NHA_ID] = { .type = NLA_U32 },
[NHA_GROUP] = { .type = NLA_BINARY }, [NHA_GROUP] = { .type = NLA_BINARY },
[NHA_GROUP_TYPE] = { .type = NLA_U16 }, [NHA_GROUP_TYPE] = { .type = NLA_U16 },
...@@ -31,8 +31,6 @@ static const struct nla_policy rtm_nh_policy[NHA_MAX + 1] = { ...@@ -31,8 +31,6 @@ static const struct nla_policy rtm_nh_policy[NHA_MAX + 1] = {
[NHA_GATEWAY] = { .type = NLA_BINARY }, [NHA_GATEWAY] = { .type = NLA_BINARY },
[NHA_ENCAP_TYPE] = { .type = NLA_U16 }, [NHA_ENCAP_TYPE] = { .type = NLA_U16 },
[NHA_ENCAP] = { .type = NLA_NESTED }, [NHA_ENCAP] = { .type = NLA_NESTED },
[NHA_GROUPS] = { .type = NLA_FLAG },
[NHA_MASTER] = { .type = NLA_U32 },
[NHA_FDB] = { .type = NLA_FLAG }, [NHA_FDB] = { .type = NLA_FLAG },
}; };
...@@ -576,7 +574,8 @@ static int nh_check_attr_fdb_group(struct nexthop *nh, u8 *nh_family, ...@@ -576,7 +574,8 @@ static int nh_check_attr_fdb_group(struct nexthop *nh, u8 *nh_family,
return 0; return 0;
} }
static int nh_check_attr_group(struct net *net, struct nlattr *tb[], static int nh_check_attr_group(struct net *net,
struct nlattr *tb[], size_t tb_size,
struct netlink_ext_ack *extack) struct netlink_ext_ack *extack)
{ {
unsigned int len = nla_len(tb[NHA_GROUP]); unsigned int len = nla_len(tb[NHA_GROUP]);
...@@ -635,7 +634,7 @@ static int nh_check_attr_group(struct net *net, struct nlattr *tb[], ...@@ -635,7 +634,7 @@ static int nh_check_attr_group(struct net *net, struct nlattr *tb[],
return -EINVAL; return -EINVAL;
} }
} }
for (i = NHA_GROUP_TYPE + 1; i < __NHA_MAX; ++i) { for (i = NHA_GROUP_TYPE + 1; i < tb_size; ++i) {
if (!tb[i]) if (!tb[i])
continue; continue;
if (i == NHA_FDB) if (i == NHA_FDB)
...@@ -1654,11 +1653,12 @@ static int rtm_to_nh_config(struct net *net, struct sk_buff *skb, ...@@ -1654,11 +1653,12 @@ static int rtm_to_nh_config(struct net *net, struct sk_buff *skb,
struct netlink_ext_ack *extack) struct netlink_ext_ack *extack)
{ {
struct nhmsg *nhm = nlmsg_data(nlh); struct nhmsg *nhm = nlmsg_data(nlh);
struct nlattr *tb[NHA_MAX + 1]; struct nlattr *tb[ARRAY_SIZE(rtm_nh_policy_new)];
int err; int err;
err = nlmsg_parse(nlh, sizeof(*nhm), tb, NHA_MAX, rtm_nh_policy, err = nlmsg_parse(nlh, sizeof(*nhm), tb,
extack); ARRAY_SIZE(rtm_nh_policy_new) - 1,
rtm_nh_policy_new, extack);
if (err < 0) if (err < 0)
return err; return err;
...@@ -1685,11 +1685,6 @@ static int rtm_to_nh_config(struct net *net, struct sk_buff *skb, ...@@ -1685,11 +1685,6 @@ static int rtm_to_nh_config(struct net *net, struct sk_buff *skb,
goto out; goto out;
} }
if (tb[NHA_GROUPS] || tb[NHA_MASTER]) {
NL_SET_ERR_MSG(extack, "Invalid attributes in request");
goto out;
}
memset(cfg, 0, sizeof(*cfg)); memset(cfg, 0, sizeof(*cfg));
cfg->nlflags = nlh->nlmsg_flags; cfg->nlflags = nlh->nlmsg_flags;
cfg->nlinfo.portid = NETLINK_CB(skb).portid; cfg->nlinfo.portid = NETLINK_CB(skb).portid;
...@@ -1731,7 +1726,7 @@ static int rtm_to_nh_config(struct net *net, struct sk_buff *skb, ...@@ -1731,7 +1726,7 @@ static int rtm_to_nh_config(struct net *net, struct sk_buff *skb,
NL_SET_ERR_MSG(extack, "Invalid group type"); NL_SET_ERR_MSG(extack, "Invalid group type");
goto out; goto out;
} }
err = nh_check_attr_group(net, tb, extack); err = nh_check_attr_group(net, tb, ARRAY_SIZE(tb), extack);
/* no other attributes should be set */ /* no other attributes should be set */
goto out; goto out;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment