Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2479c2c9 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'rtnetlink-enable-IFLA_IF_NETNSID-for-RTM_DELLINK-RTM_SETINK' 



Christian Brauner says:

====================
rtnetlink: enable IFLA_IF_NETNSID for RTM_{DEL,SET}LINK

Based on the previous discussion this enables passing a IFLA_IF_NETNSID
property along with RTM_SETLINK and RTM_DELLINK requests. The patch for
RTM_NEWLINK will be sent out in a separate patch since there are more
corner-cases to think about.

Changelog 2018-01-24:
* Preserve old behavior and report -ENODEV when either ifindex or ifname is
  provided and IFLA_GROUP is set. Spotted by Wolfgang Bumiller.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3e3ab9cc b61ad68a

net/core/rtnetlink.c

+75 −21
Original line number Diff line number Diff line
@@ -1902,6 +1902,49 @@ struct net *rtnl_link_get_net(struct net *src_net, struct nlattr *tb[]) 
}

EXPORT_SYMBOL(rtnl_link_get_net);



/* Figure out which network namespace we are talking about by

 * examining the link attributes in the following order:

 *

 * 1. IFLA_NET_NS_PID

 * 2. IFLA_NET_NS_FD

 * 3. IFLA_IF_NETNSID

 */

static struct net *rtnl_link_get_net_by_nlattr(struct net *src_net,

					       struct nlattr *tb[])

{

	struct net *net;



	if (tb[IFLA_NET_NS_PID] || tb[IFLA_NET_NS_FD])

		return rtnl_link_get_net(src_net, tb);



	if (!tb[IFLA_IF_NETNSID])

		return get_net(src_net);



	net = get_net_ns_by_id(src_net, nla_get_u32(tb[IFLA_IF_NETNSID]));

	if (!net)

		return ERR_PTR(-EINVAL);



	return net;

}



static struct net *rtnl_link_get_net_capable(const struct sk_buff *skb,

					     struct net *src_net,

					     struct nlattr *tb[], int cap)

{

	struct net *net;



	net = rtnl_link_get_net_by_nlattr(src_net, tb);

	if (IS_ERR(net))

		return net;



	if (!netlink_ns_capable(skb, net->user_ns, cap)) {

		put_net(net);

		return ERR_PTR(-EPERM);

	}



	return net;

}



static int validate_linkmsg(struct net_device *dev, struct nlattr *tb[])

{

	if (dev) {
@@ -2164,17 +2207,14 @@ static int do_setlink(const struct sk_buff *skb, 
	const struct net_device_ops *ops = dev->netdev_ops;

	int err;



	if (tb[IFLA_NET_NS_PID] || tb[IFLA_NET_NS_FD]) {

		struct net *net = rtnl_link_get_net(dev_net(dev), tb);

	if (tb[IFLA_NET_NS_PID] || tb[IFLA_NET_NS_FD] || tb[IFLA_IF_NETNSID]) {

		struct net *net = rtnl_link_get_net_capable(skb, dev_net(dev),

							    tb, CAP_NET_ADMIN);

		if (IS_ERR(net)) {

			err = PTR_ERR(net);

			goto errout;

		}

		if (!netlink_ns_capable(skb, net->user_ns, CAP_NET_ADMIN)) {

			put_net(net);

			err = -EPERM;

			goto errout;

		}



		err = dev_change_net_namespace(dev, net, ifname);

		put_net(net);

		if (err)
@@ -2515,9 +2555,6 @@ static int rtnl_setlink(struct sk_buff *skb, struct nlmsghdr *nlh, 
	if (err < 0)

		goto errout;



	if (tb[IFLA_IF_NETNSID])

		return -EOPNOTSUPP;



	if (tb[IFLA_IFNAME])

		nla_strlcpy(ifname, tb[IFLA_IFNAME], IFNAMSIZ);

	else
@@ -2602,36 +2639,53 @@ static int rtnl_dellink(struct sk_buff *skb, struct nlmsghdr *nlh, 
			struct netlink_ext_ack *extack)

{

	struct net *net = sock_net(skb->sk);

	struct net_device *dev;

	struct net *tgt_net = net;

	struct net_device *dev = NULL;

	struct ifinfomsg *ifm;

	char ifname[IFNAMSIZ];

	struct nlattr *tb[IFLA_MAX+1];

	int err;

	int netnsid = -1;



	err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFLA_MAX, ifla_policy, extack);

	if (err < 0)

		return err;



	if (tb[IFLA_IF_NETNSID])

		return -EOPNOTSUPP;



	if (tb[IFLA_IFNAME])

		nla_strlcpy(ifname, tb[IFLA_IFNAME], IFNAMSIZ);



	if (tb[IFLA_IF_NETNSID]) {

		netnsid = nla_get_s32(tb[IFLA_IF_NETNSID]);

		tgt_net = get_target_net(NETLINK_CB(skb).sk, netnsid);

		if (IS_ERR(tgt_net))

			return PTR_ERR(tgt_net);

	}



	err = -EINVAL;

	ifm = nlmsg_data(nlh);

	if (ifm->ifi_index > 0)

		dev = __dev_get_by_index(net, ifm->ifi_index);

		dev = __dev_get_by_index(tgt_net, ifm->ifi_index);

	else if (tb[IFLA_IFNAME])

		dev = __dev_get_by_name(net, ifname);

		dev = __dev_get_by_name(tgt_net, ifname);

	else if (tb[IFLA_GROUP])

		return rtnl_group_dellink(net, nla_get_u32(tb[IFLA_GROUP]));

		err = rtnl_group_dellink(tgt_net, nla_get_u32(tb[IFLA_GROUP]));

	else

		return -EINVAL;

		goto out;



	if (!dev)

		return -ENODEV;

	if (!dev) {

		if (tb[IFLA_IFNAME] || ifm->ifi_index > 0)

			err = -ENODEV;



		goto out;

	}



	err = rtnl_delete_link(dev);



out:

	if (netnsid >= 0)

		put_net(tgt_net);



	return rtnl_delete_link(dev);

	return err;

}



int rtnl_configure_link(struct net_device *dev, const struct ifinfomsg *ifm)