iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

neighbor: Add extack messages for add and delete commands

Browse Source 
Add extack messages for failures in neigh_add and neigh_delete.

Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David Ahern 2018-12-05 20:02:29 -08:00 committed by David S. Miller
parent f5d6c3e5a3
commit 7a35a50df5
1 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
net/core/neighbour.c
View File

@ -1137,8 +1137,9 @@ static void neigh_update_hhs(struct neighbour *neigh)
Caller MUST hold reference count on the entry. Caller MUST hold reference count on the entry.
*/ */
int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new, static int __neigh_update(struct neighbour *neigh, const u8 *lladdr,
u32 flags, u32 nlmsg_pid) u8 new, u32 flags, u32 nlmsg_pid,
struct netlink_ext_ack *extack)
{ {
u8 old; u8 old;
int err; int err;
@ -1155,8 +1156,10 @@ int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new,
if (!(flags & NEIGH_UPDATE_F_ADMIN) && if (!(flags & NEIGH_UPDATE_F_ADMIN) &&
(old & (NUD_NOARP | NUD_PERMANENT))) (old & (NUD_NOARP | NUD_PERMANENT)))
goto out; goto out;
if (neigh->dead) if (neigh->dead) {
NL_SET_ERR_MSG(extack, "Neighbor entry is now dead");
goto out; goto out;
}
neigh_update_ext_learned(neigh, flags, &notify); neigh_update_ext_learned(neigh, flags, &notify);
@ -1193,8 +1196,10 @@ int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new,
use it, otherwise discard the request. use it, otherwise discard the request.
*/ */
err = -EINVAL; err = -EINVAL;
if (!(old & NUD_VALID)) if (!(old & NUD_VALID)) {
NL_SET_ERR_MSG(extack, "No link layer address given");
goto out; goto out;
}
lladdr = neigh->ha; lladdr = neigh->ha;
} }
@ -1307,6 +1312,12 @@ out:
return err; return err;
} }
int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new,
u32 flags, u32 nlmsg_pid)
{
return __neigh_update(neigh, lladdr, new, flags, nlmsg_pid, NULL);
}
EXPORT_SYMBOL(neigh_update); EXPORT_SYMBOL(neigh_update);
/* Update the neigh to listen temporarily for probe responses, even if it is /* Update the neigh to listen temporarily for probe responses, even if it is
@ -1678,8 +1689,10 @@ static int neigh_delete(struct sk_buff *skb, struct nlmsghdr *nlh,
goto out; goto out;
dst_attr = nlmsg_find_attr(nlh, sizeof(*ndm), NDA_DST); dst_attr = nlmsg_find_attr(nlh, sizeof(*ndm), NDA_DST);
if (dst_attr == NULL) if (!dst_attr) {
NL_SET_ERR_MSG(extack, "Network address not specified");
goto out; goto out;
}
ndm = nlmsg_data(nlh); ndm = nlmsg_data(nlh);
if (ndm->ndm_ifindex) { if (ndm->ndm_ifindex) {
@ -1694,8 +1707,10 @@ static int neigh_delete(struct sk_buff *skb, struct nlmsghdr *nlh,
if (tbl == NULL) if (tbl == NULL)
return -EAFNOSUPPORT; return -EAFNOSUPPORT;
if (nla_len(dst_attr) < (int)tbl->key_len) if (nla_len(dst_attr) < (int)tbl->key_len) {
NL_SET_ERR_MSG(extack, "Invalid network address");
goto out; goto out;
}
if (ndm->ndm_flags & NTF_PROXY) { if (ndm->ndm_flags & NTF_PROXY) {
err = pneigh_delete(tbl, net, nla_data(dst_attr), dev); err = pneigh_delete(tbl, net, nla_data(dst_attr), dev);
@ -1711,10 +1726,9 @@ static int neigh_delete(struct sk_buff *skb, struct nlmsghdr *nlh,
goto out; goto out;
} }
err = neigh_update(neigh, NULL, NUD_FAILED, err = __neigh_update(neigh, NULL, NUD_FAILED,
NEIGH_UPDATE_F_OVERRIDE | NEIGH_UPDATE_F_OVERRIDE | NEIGH_UPDATE_F_ADMIN,
NEIGH_UPDATE_F_ADMIN, NETLINK_CB(skb).portid, extack);
NETLINK_CB(skb).portid);
write_lock_bh(&tbl->lock); write_lock_bh(&tbl->lock);
neigh_release(neigh); neigh_release(neigh);
neigh_remove_one(neigh, tbl); neigh_remove_one(neigh, tbl);
@ -1744,8 +1758,10 @@ static int neigh_add(struct sk_buff *skb, struct nlmsghdr *nlh,
goto out; goto out;
err = -EINVAL; err = -EINVAL;
if (tb[NDA_DST] == NULL) if (!tb[NDA_DST]) {
NL_SET_ERR_MSG(extack, "Network address not specified");
goto out; goto out;
}
ndm = nlmsg_data(nlh); ndm = nlmsg_data(nlh);
if (ndm->ndm_ifindex) { if (ndm->ndm_ifindex) {
@ -1755,16 +1771,21 @@ static int neigh_add(struct sk_buff *skb, struct nlmsghdr *nlh,
goto out; goto out;
} }
if (tb[NDA_LLADDR] && nla_len(tb[NDA_LLADDR]) < dev->addr_len) if (tb[NDA_LLADDR] && nla_len(tb[NDA_LLADDR]) < dev->addr_len) {
NL_SET_ERR_MSG(extack, "Invalid link address");
goto out; goto out;
} }
}
tbl = neigh_find_table(ndm->ndm_family); tbl = neigh_find_table(ndm->ndm_family);
if (tbl == NULL) if (tbl == NULL)
return -EAFNOSUPPORT; return -EAFNOSUPPORT;
if (nla_len(tb[NDA_DST]) < (int)tbl->key_len) if (nla_len(tb[NDA_DST]) < (int)tbl->key_len) {
NL_SET_ERR_MSG(extack, "Invalid network address");
goto out; goto out;
}
dst = nla_data(tb[NDA_DST]); dst = nla_data(tb[NDA_DST]);
lladdr = tb[NDA_LLADDR] ? nla_data(tb[NDA_LLADDR]) : NULL; lladdr = tb[NDA_LLADDR] ? nla_data(tb[NDA_LLADDR]) : NULL;
@ -1780,8 +1801,10 @@ static int neigh_add(struct sk_buff *skb, struct nlmsghdr *nlh,
goto out; goto out;
} }
if (dev == NULL) if (!dev) {
NL_SET_ERR_MSG(extack, "Device not specified");
goto out; goto out;
}
neigh = neigh_lookup(tbl, dst, dev); neigh = neigh_lookup(tbl, dst, dev);
if (neigh == NULL) { if (neigh == NULL) {
@ -1817,8 +1840,8 @@ static int neigh_add(struct sk_buff *skb, struct nlmsghdr *nlh,
neigh_event_send(neigh, NULL); neigh_event_send(neigh, NULL);
err = 0; err = 0;
} else } else
err = neigh_update(neigh, lladdr, ndm->ndm_state, flags, err = __neigh_update(neigh, lladdr, ndm->ndm_state, flags,
NETLINK_CB(skb).portid); NETLINK_CB(skb).portid, extack);
neigh_release(neigh); neigh_release(neigh);
out: out: