Commit 3583a4e8 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller

ipv6: report errors for iftoken via netlink extack

Setting iftoken can fail for several different reasons but there
and there was no report to user as to the cause. Add netlink
extended errors to the processing of the request.

This requires adding additional argument through rtnl_af_ops
set_link_af callback.
Reported-by: default avatarHongren Zheng <li@zenithal.me>
Signed-off-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f2fbd0aa
...@@ -147,8 +147,8 @@ struct rtnl_af_ops { ...@@ -147,8 +147,8 @@ struct rtnl_af_ops {
int (*validate_link_af)(const struct net_device *dev, int (*validate_link_af)(const struct net_device *dev,
const struct nlattr *attr); const struct nlattr *attr);
int (*set_link_af)(struct net_device *dev, int (*set_link_af)(struct net_device *dev,
const struct nlattr *attr); const struct nlattr *attr,
struct netlink_ext_ack *extack);
int (*fill_stats_af)(struct sk_buff *skb, int (*fill_stats_af)(struct sk_buff *skb,
const struct net_device *dev); const struct net_device *dev);
size_t (*get_stats_af_size)(const struct net_device *dev); size_t (*get_stats_af_size)(const struct net_device *dev);
......
...@@ -2863,7 +2863,7 @@ static int do_setlink(const struct sk_buff *skb, ...@@ -2863,7 +2863,7 @@ static int do_setlink(const struct sk_buff *skb,
BUG_ON(!(af_ops = rtnl_af_lookup(nla_type(af)))); BUG_ON(!(af_ops = rtnl_af_lookup(nla_type(af))));
err = af_ops->set_link_af(dev, af); err = af_ops->set_link_af(dev, af, extack);
if (err < 0) { if (err < 0) {
rcu_read_unlock(); rcu_read_unlock();
goto errout; goto errout;
......
...@@ -1978,7 +1978,8 @@ static int inet_validate_link_af(const struct net_device *dev, ...@@ -1978,7 +1978,8 @@ static int inet_validate_link_af(const struct net_device *dev,
return 0; return 0;
} }
static int inet_set_link_af(struct net_device *dev, const struct nlattr *nla) static int inet_set_link_af(struct net_device *dev, const struct nlattr *nla,
struct netlink_ext_ack *extack)
{ {
struct in_device *in_dev = __in_dev_get_rcu(dev); struct in_device *in_dev = __in_dev_get_rcu(dev);
struct nlattr *a, *tb[IFLA_INET_MAX+1]; struct nlattr *a, *tb[IFLA_INET_MAX+1];
......
...@@ -5669,7 +5669,8 @@ static int inet6_fill_link_af(struct sk_buff *skb, const struct net_device *dev, ...@@ -5669,7 +5669,8 @@ static int inet6_fill_link_af(struct sk_buff *skb, const struct net_device *dev,
return 0; return 0;
} }
static int inet6_set_iftoken(struct inet6_dev *idev, struct in6_addr *token) static int inet6_set_iftoken(struct inet6_dev *idev, struct in6_addr *token,
struct netlink_ext_ack *extack)
{ {
struct inet6_ifaddr *ifp; struct inet6_ifaddr *ifp;
struct net_device *dev = idev->dev; struct net_device *dev = idev->dev;
...@@ -5680,12 +5681,29 @@ static int inet6_set_iftoken(struct inet6_dev *idev, struct in6_addr *token) ...@@ -5680,12 +5681,29 @@ static int inet6_set_iftoken(struct inet6_dev *idev, struct in6_addr *token)
if (!token) if (!token)
return -EINVAL; return -EINVAL;
if (dev->flags & (IFF_LOOPBACK | IFF_NOARP))
if (dev->flags & IFF_LOOPBACK) {
NL_SET_ERR_MSG_MOD(extack, "Device is loopback");
return -EINVAL; return -EINVAL;
if (!ipv6_accept_ra(idev)) }
if (dev->flags & IFF_NOARP) {
NL_SET_ERR_MSG_MOD(extack,
"Device does not do neighbour discovery");
return -EINVAL;
}
if (!ipv6_accept_ra(idev)) {
NL_SET_ERR_MSG_MOD(extack,
"Router advertisement is disabled on device");
return -EINVAL; return -EINVAL;
if (idev->cnf.rtr_solicits == 0) }
if (idev->cnf.rtr_solicits == 0) {
NL_SET_ERR_MSG(extack,
"Router solicitation is disabled on device");
return -EINVAL; return -EINVAL;
}
write_lock_bh(&idev->lock); write_lock_bh(&idev->lock);
...@@ -5793,7 +5811,8 @@ static int inet6_validate_link_af(const struct net_device *dev, ...@@ -5793,7 +5811,8 @@ static int inet6_validate_link_af(const struct net_device *dev,
return 0; return 0;
} }
static int inet6_set_link_af(struct net_device *dev, const struct nlattr *nla) static int inet6_set_link_af(struct net_device *dev, const struct nlattr *nla,
struct netlink_ext_ack *extack)
{ {
struct inet6_dev *idev = __in6_dev_get(dev); struct inet6_dev *idev = __in6_dev_get(dev);
struct nlattr *tb[IFLA_INET6_MAX + 1]; struct nlattr *tb[IFLA_INET6_MAX + 1];
...@@ -5806,7 +5825,8 @@ static int inet6_set_link_af(struct net_device *dev, const struct nlattr *nla) ...@@ -5806,7 +5825,8 @@ static int inet6_set_link_af(struct net_device *dev, const struct nlattr *nla)
BUG(); BUG();
if (tb[IFLA_INET6_TOKEN]) { if (tb[IFLA_INET6_TOKEN]) {
err = inet6_set_iftoken(idev, nla_data(tb[IFLA_INET6_TOKEN])); err = inet6_set_iftoken(idev, nla_data(tb[IFLA_INET6_TOKEN]),
extack);
if (err) if (err)
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment