This is a note to let you know that I've just added the patch titled
vlan: vlan_changelink() should propagate errors
to the 4.19-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
vlan-vlan_changelink-should-propagate-errors.patch
and it can be found in the queue-4.19 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Sat 11 Jan 2020 09:14:34 AM CET
From: Eric Dumazet <edumazet@xxxxxxxxxx>
Date: Tue, 7 Jan 2020 01:42:25 -0800
Subject: vlan: vlan_changelink() should propagate errors
From: Eric Dumazet <edumazet@xxxxxxxxxx>
[ 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: 07b5b17e157b ("[VLAN]: Use rtnl_link API")
Signed-off-by: Eric Dumazet <edumazet@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/8021q/vlan_netlink.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
--- a/net/8021q/vlan_netlink.c
+++ b/net/8021q/vlan_netlink.c
@@ -110,11 +110,13 @@ static int vlan_changelink(struct net_de
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_de
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;
Patches currently in stable-queue which might be from edumazet@xxxxxxxxxx are
queue-4.19/vlan-vlan_changelink-should-propagate-errors.patch
queue-4.19/net-usb-lan78xx-fix-possible-skb-leak.patch
queue-4.19/bpf-clear-skb-tstamp-in-bpf_redirect-when-necessary.patch
queue-4.19/pkt_sched-fq-do-not-accept-silly-tca_fq_quantum.patch
queue-4.19/vlan-fix-memory-leak-in-vlan_dev_set_egress_priority.patch
queue-4.19/gtp-fix-bad-unlock-balance-in-gtp_encap_enable_socket.patch
queue-4.19/macvlan-do-not-assume-mac_header-is-set-in-macvlan_broadcast.patch
queue-4.19/tcp-fix-old-stuff-d-sack-causing-sack-to-be-treated-as-d-sack.patch
