From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 4E8FD60B12 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 798C460806 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=guuAiKTMq1cHWylnX+TBumTs3dPvMOVIRHAI4ZB3SJE=; b=PQC1QCUoVqroTSCHF/lOvuWW6cLfcjVkC/rvoqW+x3mbnp8xbbq9vJ1xiYza0JSYR0wXX3pL1UZNrZ+mXLTyyFRZNEL1jtukkZaMXu1kc6eNHBSu+RFh4Vd4EgdO0QngsOttt07G2GIa4YvLkMb5cKeQwktNGLePIMVw4SplypGwOjSXoTtaK7DJgaORju310BFsG1Vmw/ygBSdg3cSDv9/ilqTiROm7uDh4ti0FQI36eubTa2pzWWvn/Z9gSppqaomyuBYL/jIjCm8AEbUeW0e/KLDqYHfqIeLOdBD2BAtDdslu7aTXiuyWtElNypwjnMHbWqYcH9WKLShaeGwOog== From: Ido Schimmel Date: Sat, 10 Dec 2022 16:56:22 +0200 Message-Id: <20221210145633.1328511-4-idosch@nvidia.com> In-Reply-To: <20221210145633.1328511-1-idosch@nvidia.com> References: <20221210145633.1328511-1-idosch@nvidia.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain MIME-Version: 1.0 Subject: [Bridge] [PATCH net-next v2 03/14] bridge: mcast: Place netlink policy before validation functions List-Id: Linux Ethernet Bridging List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: netdev@vger.kernel.org, bridge@lists.linux-foundation.org Cc: mlxsw@nvidia.com, razor@blackwall.org, Ido Schimmel , edumazet@google.com, roopa@nvidia.com, kuba@kernel.org, pabeni@redhat.com, davem@davemloft.net 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: Ido Schimmel Acked-by: Nikolay Aleksandrov --- net/bridge/br_mdb.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c index e3bd2122d559..fcdd464cf997 100644 --- a/net/bridge/br_mdb.c +++ b/net/bridge/br_mdb.c @@ -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, -- 2.37.3