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

Commit a98672dd authored by Eric Dumazet's avatar Eric Dumazet Committed by Greg Kroah-Hartman
Browse files

vlan: vlan_changelink() should propagate errors 



[ Upstream commit eb8ef2a3c50092bb018077c047b8dba1ce0e78e3 ]

Both vlan_dev_change_flags() and vlan_dev_set_egress_priority()
can return an error. vlan_changelink() should not ignore them.

Fixes: 07b5b17e ("[VLAN]: Use rtnl_link API")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4e71a156

net/8021q/vlan_netlink.c

+7 −3
Original line number Diff line number Diff line
@@ -110,11 +110,13 @@ static int vlan_changelink(struct net_device *dev, struct nlattr *tb[], 
	struct ifla_vlan_flags *flags;

	struct ifla_vlan_qos_mapping *m;

	struct nlattr *attr;

	int rem;

	int rem, err;



	if (data[IFLA_VLAN_FLAGS]) {

		flags = nla_data(data[IFLA_VLAN_FLAGS]);

		vlan_dev_change_flags(dev, flags->flags, flags->mask);

		err = vlan_dev_change_flags(dev, flags->flags, flags->mask);

		if (err)

			return err;

	}

	if (data[IFLA_VLAN_INGRESS_QOS]) {

		nla_for_each_nested(attr, data[IFLA_VLAN_INGRESS_QOS], rem) {
@@ -125,7 +127,9 @@ static int vlan_changelink(struct net_device *dev, struct nlattr *tb[], 
	if (data[IFLA_VLAN_EGRESS_QOS]) {

		nla_for_each_nested(attr, data[IFLA_VLAN_EGRESS_QOS], rem) {

			m = nla_data(attr);

			vlan_dev_set_egress_priority(dev, m->from, m->to);

			err = vlan_dev_set_egress_priority(dev, m->from, m->to);

			if (err)

				return err;

		}

	}

	return 0;