Home Home > GIT Browse > SLE15-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-05-10 14:13:58 +0200
committerJiri Slaby <jslaby@suse.cz>2019-05-16 08:27:58 +0200
commit126c1f8d287aa094312ccc99dc8b51e8b6450b1c (patch)
treea102dac63662cc28e4b0955afc2f464e33750057
parent9fbb4234d7f2a8b569a0327c54ca5522d87ea2be (diff)
tun: properly test for IFF_UP (networking-stable-19_03_28).
-rw-r--r--patches.suse/tun-properly-test-for-IFF_UP.patch80
-rw-r--r--series.conf1
2 files changed, 81 insertions, 0 deletions
diff --git a/patches.suse/tun-properly-test-for-IFF_UP.patch b/patches.suse/tun-properly-test-for-IFF_UP.patch
new file mode 100644
index 0000000000..c5aa0c9610
--- /dev/null
+++ b/patches.suse/tun-properly-test-for-IFF_UP.patch
@@ -0,0 +1,80 @@
+From: Eric Dumazet <edumazet@google.com>
+Date: Thu, 14 Mar 2019 20:19:47 -0700
+Subject: tun: properly test for IFF_UP
+Git-commit: 4477138fa0ae4e1b699786ef0600863ea6e6c61c
+Patch-mainline: v5.1-rc3
+References: networking-stable-19_03_28
+
+Same reasons than the ones explained in commit 4179cb5a4c92
+("vxlan: test dev->flags & IFF_UP before calling netif_rx()")
+
+netif_rx_ni() or napi_gro_frags() must be called under a strict contract.
+
+At device dismantle phase, core networking clears IFF_UP
+and flush_all_backlogs() is called after rcu grace period
+to make sure no incoming packet might be in a cpu backlog
+and still referencing the device.
+
+A similar protocol is used for gro layer.
+
+Most drivers call netif_rx() from their interrupt handler,
+and since the interrupts are disabled at device dismantle,
+netif_rx() does not have to check dev->flags & IFF_UP
+
+Virtual drivers do not have this guarantee, and must
+therefore make the check themselves.
+
+Fixes: 1bd4978a88ac ("tun: honor IFF_UP in tun_get_user()")
+Signed-off-by: Eric Dumazet <edumazet@google.com>
+Reported-by: syzbot <syzkaller@googlegroups.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ drivers/net/tun.c | 15 +++++++++++----
+ 1 file changed, 11 insertions(+), 4 deletions(-)
+
+--- a/drivers/net/tun.c
++++ b/drivers/net/tun.c
+@@ -1220,9 +1220,6 @@ static ssize_t tun_get_user(struct tun_s
+ int err;
+ u32 rxhash;
+
+- if (!(tun->dev->flags & IFF_UP))
+- return -EIO;
+-
+ if (!(tun->flags & IFF_NO_PI)) {
+ if (len < sizeof(pi))
+ return -EINVAL;
+@@ -1297,9 +1294,11 @@ static ssize_t tun_get_user(struct tun_s
+ err = skb_copy_datagram_from_iter(skb, 0, from, len);
+
+ if (err) {
++ err = -EFAULT;
++drop:
+ this_cpu_inc(tun->pcpu_stats->rx_dropped);
+ kfree_skb(skb);
+- return -EFAULT;
++ return err;
+ }
+
+ if (virtio_net_hdr_to_skb(skb, &gso, tun_is_little_endian(tun))) {
+@@ -1350,11 +1349,19 @@ static ssize_t tun_get_user(struct tun_s
+ skb_probe_transport_header(skb, 0);
+
+ rxhash = skb_get_hash(skb);
++
++ rcu_read_lock();
++ if (unlikely(!(tun->dev->flags & IFF_UP))) {
++ err = -EIO;
++ goto drop;
++ }
++
+ #ifndef CONFIG_4KSTACKS
+ tun_rx_batched(tun, tfile, skb, more);
+ #else
+ netif_rx_ni(skb);
+ #endif
++ rcu_read_unlock();
+
+ stats = get_cpu_ptr(tun->pcpu_stats);
+ u64_stats_update_begin(&stats->syncp);
diff --git a/series.conf b/series.conf
index 4186544fae..195538c2d0 100644
--- a/series.conf
+++ b/series.conf
@@ -21578,6 +21578,7 @@
patches.fixes/NFS-fix-mount-umount-race-in-nlmclnt.patch
patches.fixes/NFSv4.1-don-t-free-interrupted-slot-on-open.patch
patches.fixes/NFS-Fix-a-typo-in-nfs_init_timeout_values.patch
+ patches.suse/tun-properly-test-for-IFF_UP.patch
patches.drivers/mISDN-hfcpci-Test-both-vendor-device-ID-for-Digium-H.patch
patches.suse/net-packet-Set-__GFP_NOWARN-upon-allocation-in-alloc.patch
patches.fixes/0001-netfilter-bridge-set-skb-transport_header-before-ent.patch