rtnetlink: Move ops->validate to rtnl_newlink().

ops->validate() does not require RTNL.

Let's move it to rtnl_newlink().

Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index e708f0852602cc85de8807290513c995a0381006..9c9290a6c2716456c46e68837df700f34d6b10a0 100644 (file)
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -3692,16 +3692,14 @@ out_unregister:
 static int __rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,
                          const struct rtnl_link_ops *ops,
                          struct rtnl_newlink_tbs *tbs,
+                         struct nlattr **data,
                          struct netlink_ext_ack *extack)
 {
-       struct nlattr ** const linkinfo = tbs->linkinfo;
        struct nlattr ** const tb = tbs->tb;
        struct net *net = sock_net(skb->sk);
        struct net_device *dev;
        struct ifinfomsg *ifm;
-       struct nlattr **data;
        bool link_specified;
-       int err;
 
        ifm = nlmsg_data(nlh);
        if (ifm->ifi_index > 0) {
@@ -3718,26 +3716,6 @@ static int __rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,
                dev = NULL;
        }
 
-       data = NULL;
-       if (ops) {
-               if (ops->maxtype > RTNL_MAX_TYPE)
-                       return -EINVAL;
-
-               if (ops->maxtype && linkinfo[IFLA_INFO_DATA]) {
-                       err = nla_parse_nested_deprecated(tbs->attr, ops->maxtype,
-                                                         linkinfo[IFLA_INFO_DATA],
-                                                         ops->policy, extack);
-                       if (err < 0)
-                               return err;
-                       data = tbs->attr;
-               }
-               if (ops->validate) {
-                       err = ops->validate(tb, data, extack);
-                       if (err < 0)
-                               return err;
-               }
-       }
-
        if (dev)
                return rtnl_changelink(skb, nlh, ops, dev, tbs, data, extack);
 
@@ -3768,8 +3746,8 @@ static int __rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,
 static int rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,
                        struct netlink_ext_ack *extack)
 {
+       struct nlattr **tb, **linkinfo, **data = NULL;
        const struct rtnl_link_ops *ops = NULL;
-       struct nlattr **tb, **linkinfo;
        struct rtnl_newlink_tbs *tbs;
        int ret;
 
@@ -3813,7 +3791,28 @@ static int rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,
 #endif
        }
 
-       ret = __rtnl_newlink(skb, nlh, ops, tbs, extack);
+       if (ops) {
+               if (ops->maxtype > RTNL_MAX_TYPE)
+                       return -EINVAL;
+
+               if (ops->maxtype && linkinfo[IFLA_INFO_DATA]) {
+                       ret = nla_parse_nested_deprecated(tbs->attr, ops->maxtype,
+                                                         linkinfo[IFLA_INFO_DATA],
+                                                         ops->policy, extack);
+                       if (ret < 0)
+                               goto free;
+
+                       data = tbs->attr;
+               }
+
+               if (ops->validate) {
+                       ret = ops->validate(tb, data, extack);
+                       if (ret < 0)
+                               goto free;
+               }
+       }
+
+       ret = __rtnl_newlink(skb, nlh, ops, tbs, data, extack);
 
 free:
        kfree(tbs);