Commit 1870a2d3 authored by Ido Schimmel's avatar Ido Schimmel Committed by Jakub Kicinski
Browse files

bridge: mcast: Place netlink policy before validation functions 



Subsequent patches are going to add additional validation functions and
netlink policies. Some of these functions will need to perform parsing
using nla_parse_nested() and the new policies.

In order to keep all the policies next to each other, move the current
policy to before the validation functions.

Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Acked-by: default avatarNikolay Aleksandrov <razor@blackwall.org>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 6ff1e68e

net/bridge/br_mdb.c

+6 −6
Original line number Diff line number Diff line
@@ -663,6 +663,12 @@ void br_rtr_notify(struct net_device *dev, struct net_bridge_mcast_port *pmctx, 
	rtnl_set_sk_err(net, RTNLGRP_MDB, err);

}



static const struct nla_policy br_mdbe_attrs_pol[MDBE_ATTR_MAX + 1] = {

	[MDBE_ATTR_SOURCE] = NLA_POLICY_RANGE(NLA_BINARY,

					      sizeof(struct in_addr),

					      sizeof(struct in6_addr)),

};



static bool is_valid_mdb_entry(struct br_mdb_entry *entry,

			       struct netlink_ext_ack *extack)

{
@@ -748,12 +754,6 @@ static bool is_valid_mdb_source(struct nlattr *attr, __be16 proto, 
	return true;

}



static const struct nla_policy br_mdbe_attrs_pol[MDBE_ATTR_MAX + 1] = {

	[MDBE_ATTR_SOURCE] = NLA_POLICY_RANGE(NLA_BINARY,

					      sizeof(struct in_addr),

					      sizeof(struct in6_addr)),

};



static struct net_bridge_mcast *

__br_mdb_choose_context(struct net_bridge *br,

			const struct br_mdb_entry *entry,