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

Commit 53b94835 authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

net: vrf: Add extack messages for newlink failures 



Add extack error messages for failure paths creating vrf devices. Once
extack support is added to iproute2, we go from the unhelpful:
    $  ip li add foobar type vrf
    RTNETLINK answers: Invalid argument

to:
    $ ip li add foobar type vrf
    Error: VRF table id is missing

Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 733a707d

drivers/net/vrf.c

+13 −4
Original line number Diff line number Diff line
@@ -1371,11 +1371,15 @@ static int vrf_validate(struct nlattr *tb[], struct nlattr *data[], 
			struct netlink_ext_ack *extack)

{

	if (tb[IFLA_ADDRESS]) {

		if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN)

		if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN) {

			NL_SET_ERR_MSG(extack, "Invalid hardware address");

			return -EINVAL;

		if (!is_valid_ether_addr(nla_data(tb[IFLA_ADDRESS])))

		}

		if (!is_valid_ether_addr(nla_data(tb[IFLA_ADDRESS]))) {

			NL_SET_ERR_MSG(extack, "Invalid hardware address");

			return -EADDRNOTAVAIL;

		}

	}

	return 0;

}
@@ -1399,12 +1403,17 @@ static int vrf_newlink(struct net *src_net, struct net_device *dev, 
	struct net *net;

	int err;



	if (!data || !data[IFLA_VRF_TABLE])

	if (!data || !data[IFLA_VRF_TABLE]) {

		NL_SET_ERR_MSG(extack, "VRF table id is missing");

		return -EINVAL;

	}



	vrf->tb_id = nla_get_u32(data[IFLA_VRF_TABLE]);

	if (vrf->tb_id == RT_TABLE_UNSPEC)

	if (vrf->tb_id == RT_TABLE_UNSPEC) {

		NL_SET_ERR_MSG_ATTR(extack, data[IFLA_VRF_TABLE],

				    "Invalid VRF table id");

		return -EINVAL;

	}



	dev->priv_flags |= IFF_L3MDEV_MASTER;