@@ -3563,6 +3563,80 @@ struct rtnl_newlink_tbs {
struct nlattr *slave_attr[RTNL_SLAVE_MAX_TYPE + 1];
};
+static int __rtnl_newlink_setlink(struct sk_buff *skb, struct nlmsghdr *nlh,
+ struct rtnl_newlink_tbs *tbs,
+ struct netlink_ext_ack *extack,
+ struct net *target_net, struct net_device *dev,
+ const struct rtnl_link_ops *ops,
+ struct nlattr **linkinfo, struct nlattr **data)
+{
+ const struct rtnl_link_ops *m_ops = NULL;
+ struct ifinfomsg *ifm = nlmsg_data(nlh);
+ struct nlattr ** const tb = tbs->tb;
+ struct nlattr **slave_data = NULL;
+ struct net_device *master_dev;
+ int err, status = 0;
+
+ if (nlh->nlmsg_flags & NLM_F_EXCL)
+ return -EEXIST;
+ if (nlh->nlmsg_flags & NLM_F_REPLACE)
+ return -EOPNOTSUPP;
+
+ err = validate_linkmsg(dev, tb, extack);
+ if (err < 0)
+ return err;
+
+ master_dev = netdev_master_upper_dev_get(dev);
+ if (master_dev)
+ m_ops = master_dev->rtnl_link_ops;
+
+ if (m_ops) {
+ err = -EINVAL;
+ if (m_ops->slave_maxtype > RTNL_SLAVE_MAX_TYPE)
+ goto out;
+
+ if (m_ops->slave_maxtype &&
+ linkinfo[IFLA_INFO_SLAVE_DATA]) {
+ err = nla_parse_nested_deprecated(tbs->slave_attr,
+ m_ops->slave_maxtype,
+ linkinfo[IFLA_INFO_SLAVE_DATA],
+ m_ops->slave_policy,
+ extack);
+ if (err < 0)
+ goto out;
+ slave_data = tbs->slave_attr;
+ }
+ }
+
+ if (linkinfo[IFLA_INFO_DATA]) {
+ err = -EOPNOTSUPP;
+ if (!ops || ops != dev->rtnl_link_ops ||
+ !ops->changelink)
+ goto out;
+
+ err = ops->changelink(dev, tb, data, extack);
+ if (err < 0)
+ goto out;
+ status |= DO_SETLINK_NOTIFY;
+ }
+
+ if (linkinfo[IFLA_INFO_SLAVE_DATA]) {
+ err = -EOPNOTSUPP;
+ if (!m_ops || !m_ops->slave_changelink)
+ goto out;
+
+ err = m_ops->slave_changelink(master_dev, dev, tb,
+ slave_data, extack);
+ if (err < 0)
+ goto out;
+ status |= DO_SETLINK_NOTIFY;
+ }
+
+ err = do_setlink(target_net, skb, dev, ifm, extack, tb, status);
+out:
+ return err;
+}
+
static int __rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,
struct rtnl_newlink_tbs *tbs,
struct netlink_ext_ack *extack,
@@ -3570,11 +3644,8 @@ static int __rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,
{
struct nlattr *linkinfo[IFLA_INFO_MAX + 1];
struct nlattr ** const tb = tbs->tb;
- const struct rtnl_link_ops *m_ops;
- struct net_device *master_dev;
struct net *net = sock_net(skb->sk);
const struct rtnl_link_ops *ops;
- struct nlattr **slave_data;
char kind[MODULE_NAME_LEN];
struct net_device *dev;
struct ifinfomsg *ifm;
@@ -3585,29 +3656,6 @@ static int __rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,
#ifdef CONFIG_MODULES
replay:
#endif
- ifm = nlmsg_data(nlh);
- if (ifm->ifi_index > 0) {
- link_specified = true;
- dev = __dev_get_by_index(net, ifm->ifi_index);
- } else if (ifm->ifi_index < 0) {
- NL_SET_ERR_MSG(extack, "ifindex can't be negative");
- return -EINVAL;
- } else if (tb[IFLA_IFNAME] || tb[IFLA_ALT_IFNAME]) {
- link_specified = true;
- dev = rtnl_dev_get(net, tb);
- } else {
- link_specified = false;
- dev = NULL;
- }
-
- master_dev = NULL;
- m_ops = NULL;
- if (dev) {
- master_dev = netdev_master_upper_dev_get(dev);
- if (master_dev)
- m_ops = master_dev->rtnl_link_ops;
- }
-
if (tb[IFLA_LINKINFO]) {
err = nla_parse_nested_deprecated(linkinfo, IFLA_INFO_MAX,
tb[IFLA_LINKINFO],
@@ -3645,59 +3693,26 @@ static int __rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,
}
}
- slave_data = NULL;
- if (m_ops) {
- if (m_ops->slave_maxtype > RTNL_SLAVE_MAX_TYPE)
- return -EINVAL;
-
- if (m_ops->slave_maxtype &&
- linkinfo[IFLA_INFO_SLAVE_DATA]) {
- err = nla_parse_nested_deprecated(tbs->slave_attr,
- m_ops->slave_maxtype,
- linkinfo[IFLA_INFO_SLAVE_DATA],
- m_ops->slave_policy,
- extack);
- if (err < 0)
- return err;
- slave_data = tbs->slave_attr;
- }
+ ifm = nlmsg_data(nlh);
+ if (ifm->ifi_index > 0) {
+ link_specified = true;
+ dev = __dev_get_by_index(net, ifm->ifi_index);
+ } else if (ifm->ifi_index < 0) {
+ NL_SET_ERR_MSG(extack, "ifindex can't be negative");
+ return -EINVAL;
+ } else if (tb[IFLA_IFNAME] || tb[IFLA_ALT_IFNAME]) {
+ link_specified = true;
+ dev = rtnl_dev_get(net, tb);
+ } else {
+ link_specified = false;
+ dev = NULL;
}
if (dev) {
- int status = 0;
-
- if (nlh->nlmsg_flags & NLM_F_EXCL)
- return -EEXIST;
- if (nlh->nlmsg_flags & NLM_F_REPLACE)
- return -EOPNOTSUPP;
-
- err = validate_linkmsg(dev, tb, extack);
- if (err < 0)
- return err;
-
- if (linkinfo[IFLA_INFO_DATA]) {
- if (!ops || ops != dev->rtnl_link_ops ||
- !ops->changelink)
- return -EOPNOTSUPP;
-
- err = ops->changelink(dev, tb, data, extack);
- if (err < 0)
- return err;
- status |= DO_SETLINK_NOTIFY;
- }
-
- if (linkinfo[IFLA_INFO_SLAVE_DATA]) {
- if (!m_ops || !m_ops->slave_changelink)
- return -EOPNOTSUPP;
-
- err = m_ops->slave_changelink(master_dev, dev, tb,
- slave_data, extack);
- if (err < 0)
- return err;
- status |= DO_SETLINK_NOTIFY;
- }
-
- return do_setlink(target_net, skb, dev, ifm, extack, tb, status);
+ err = __rtnl_newlink_setlink(skb, nlh, tbs, extack,
+ target_net, dev,
+ ops, linkinfo, data);
+ return err;
}
if (!(nlh->nlmsg_flags & NLM_F_CREATE)) {
The patch is preparation in rtnetlink code for using nd_lock. This is a step to move dereference of tb[IFLA_MASTER] up to where main dev is dereferenced by ifi_index. Signed-off-by: Kirill Tkhai <tkhai@ya.ru> --- net/core/rtnetlink.c | 167 +++++++++++++++++++++++++++----------------------- 1 file changed, 91 insertions(+), 76 deletions(-)