Commit e92695e5 authored by Alaa Mohamed's avatar Alaa Mohamed Committed by David S. Miller

net: vxlan: Add extack support to vxlan_fdb_delete

This patch adds extack msg support to vxlan_fdb_delete and vxlan_fdb_parse.
extack is used to propagate meaningful error msgs to the user of vxlan
fdb netlink api
Signed-off-by: default avatarAlaa Mohamed <eng.alaamohamedsoliman.am@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ca4567f1
...@@ -1129,19 +1129,25 @@ static void vxlan_fdb_dst_destroy(struct vxlan_dev *vxlan, struct vxlan_fdb *f, ...@@ -1129,19 +1129,25 @@ static void vxlan_fdb_dst_destroy(struct vxlan_dev *vxlan, struct vxlan_fdb *f,
static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan, static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan,
union vxlan_addr *ip, __be16 *port, __be32 *src_vni, union vxlan_addr *ip, __be16 *port, __be32 *src_vni,
__be32 *vni, u32 *ifindex, u32 *nhid) __be32 *vni, u32 *ifindex, u32 *nhid,
struct netlink_ext_ack *extack)
{ {
struct net *net = dev_net(vxlan->dev); struct net *net = dev_net(vxlan->dev);
int err; int err;
if (tb[NDA_NH_ID] && (tb[NDA_DST] || tb[NDA_VNI] || tb[NDA_IFINDEX] || if (tb[NDA_NH_ID] && (tb[NDA_DST] || tb[NDA_VNI] || tb[NDA_IFINDEX] ||
tb[NDA_PORT])) tb[NDA_PORT])) {
return -EINVAL; NL_SET_ERR_MSG(extack,
"DST, VNI, ifindex and port are mutually exclusive with NH_ID");
return -EINVAL;
}
if (tb[NDA_DST]) { if (tb[NDA_DST]) {
err = vxlan_nla_get_addr(ip, tb[NDA_DST]); err = vxlan_nla_get_addr(ip, tb[NDA_DST]);
if (err) if (err) {
NL_SET_ERR_MSG(extack, "Unsupported address family");
return err; return err;
}
} else { } else {
union vxlan_addr *remote = &vxlan->default_dst.remote_ip; union vxlan_addr *remote = &vxlan->default_dst.remote_ip;
...@@ -1157,24 +1163,30 @@ static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan, ...@@ -1157,24 +1163,30 @@ static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan,
} }
if (tb[NDA_PORT]) { if (tb[NDA_PORT]) {
if (nla_len(tb[NDA_PORT]) != sizeof(__be16)) if (nla_len(tb[NDA_PORT]) != sizeof(__be16)) {
NL_SET_ERR_MSG(extack, "Invalid vxlan port");
return -EINVAL; return -EINVAL;
}
*port = nla_get_be16(tb[NDA_PORT]); *port = nla_get_be16(tb[NDA_PORT]);
} else { } else {
*port = vxlan->cfg.dst_port; *port = vxlan->cfg.dst_port;
} }
if (tb[NDA_VNI]) { if (tb[NDA_VNI]) {
if (nla_len(tb[NDA_VNI]) != sizeof(u32)) if (nla_len(tb[NDA_VNI]) != sizeof(u32)) {
NL_SET_ERR_MSG(extack, "Invalid vni");
return -EINVAL; return -EINVAL;
}
*vni = cpu_to_be32(nla_get_u32(tb[NDA_VNI])); *vni = cpu_to_be32(nla_get_u32(tb[NDA_VNI]));
} else { } else {
*vni = vxlan->default_dst.remote_vni; *vni = vxlan->default_dst.remote_vni;
} }
if (tb[NDA_SRC_VNI]) { if (tb[NDA_SRC_VNI]) {
if (nla_len(tb[NDA_SRC_VNI]) != sizeof(u32)) if (nla_len(tb[NDA_SRC_VNI]) != sizeof(u32)) {
NL_SET_ERR_MSG(extack, "Invalid src vni");
return -EINVAL; return -EINVAL;
}
*src_vni = cpu_to_be32(nla_get_u32(tb[NDA_SRC_VNI])); *src_vni = cpu_to_be32(nla_get_u32(tb[NDA_SRC_VNI]));
} else { } else {
*src_vni = vxlan->default_dst.remote_vni; *src_vni = vxlan->default_dst.remote_vni;
...@@ -1183,12 +1195,16 @@ static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan, ...@@ -1183,12 +1195,16 @@ static int vxlan_fdb_parse(struct nlattr *tb[], struct vxlan_dev *vxlan,
if (tb[NDA_IFINDEX]) { if (tb[NDA_IFINDEX]) {
struct net_device *tdev; struct net_device *tdev;
if (nla_len(tb[NDA_IFINDEX]) != sizeof(u32)) if (nla_len(tb[NDA_IFINDEX]) != sizeof(u32)) {
NL_SET_ERR_MSG(extack, "Invalid ifindex");
return -EINVAL; return -EINVAL;
}
*ifindex = nla_get_u32(tb[NDA_IFINDEX]); *ifindex = nla_get_u32(tb[NDA_IFINDEX]);
tdev = __dev_get_by_index(net, *ifindex); tdev = __dev_get_by_index(net, *ifindex);
if (!tdev) if (!tdev) {
NL_SET_ERR_MSG(extack, "Device not found");
return -EADDRNOTAVAIL; return -EADDRNOTAVAIL;
}
} else { } else {
*ifindex = 0; *ifindex = 0;
} }
...@@ -1226,7 +1242,7 @@ static int vxlan_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], ...@@ -1226,7 +1242,7 @@ static int vxlan_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
return -EINVAL; return -EINVAL;
err = vxlan_fdb_parse(tb, vxlan, &ip, &port, &src_vni, &vni, &ifindex, err = vxlan_fdb_parse(tb, vxlan, &ip, &port, &src_vni, &vni, &ifindex,
&nhid); &nhid, extack);
if (err) if (err)
return err; return err;
...@@ -1292,7 +1308,7 @@ static int vxlan_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[], ...@@ -1292,7 +1308,7 @@ static int vxlan_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],
int err; int err;
err = vxlan_fdb_parse(tb, vxlan, &ip, &port, &src_vni, &vni, &ifindex, err = vxlan_fdb_parse(tb, vxlan, &ip, &port, &src_vni, &vni, &ifindex,
&nhid); &nhid, 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