fixes for 5.4

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.4/macvlan-use-skb_reset_mac_header-in-macvlan_queue_xm.patch b/queue-5.4/macvlan-use-skb_reset_mac_header-in-macvlan_queue_xm.patch
new file mode 100644 (file)
index 0000000..bf502f9
--- /dev/null
+++ b/queue-5.4/macvlan-use-skb_reset_mac_header-in-macvlan_queue_xm.patch
@@ -0,0 +1,54 @@
+From 0006c4b0ae7257e960e87a6a20774acd8732bbf4 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Tue, 14 Jan 2020 13:00:35 -0800
+Subject: macvlan: use skb_reset_mac_header() in macvlan_queue_xmit()
+
+From: Eric Dumazet <edumazet@google.com>
+
+[ Upstream commit 1712b2fff8c682d145c7889d2290696647d82dab ]
+
+I missed the fact that macvlan_broadcast() can be used both
+in RX and TX.
+
+skb_eth_hdr() makes only sense in TX paths, so we can not
+use it blindly in macvlan_broadcast()
+
+Fixes: 96cc4b69581d ("macvlan: do not assume mac_header is set in macvlan_broadcast()")
+Signed-off-by: Eric Dumazet <edumazet@google.com>
+Reported-by: Jurgen Van Ham <juvanham@gmail.com>
+Tested-by: Matteo Croce <mcroce@redhat.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/net/macvlan.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
+index 747c0542a53c..c5bf61565726 100644
+--- a/drivers/net/macvlan.c
++++ b/drivers/net/macvlan.c
+@@ -259,7 +259,7 @@ static void macvlan_broadcast(struct sk_buff *skb,
+                             struct net_device *src,
+                             enum macvlan_mode mode)
+ {
+-      const struct ethhdr *eth = skb_eth_hdr(skb);
++      const struct ethhdr *eth = eth_hdr(skb);
+       const struct macvlan_dev *vlan;
+       struct sk_buff *nskb;
+       unsigned int i;
+@@ -513,10 +513,11 @@ static int macvlan_queue_xmit(struct sk_buff *skb, struct net_device *dev)
+       const struct macvlan_dev *dest;
+ 
+       if (vlan->mode == MACVLAN_MODE_BRIDGE) {
+-              const struct ethhdr *eth = (void *)skb->data;
++              const struct ethhdr *eth = skb_eth_hdr(skb);
+ 
+               /* send to other bridge ports directly */
+               if (is_multicast_ether_addr(eth->h_dest)) {
++                      skb_reset_mac_header(skb);
+                       macvlan_broadcast(skb, port, dev, MACVLAN_MODE_BRIDGE);
+                       goto xmit_world;
+               }
+-- 
+2.20.1
+

diff --git a/queue-5.4/series b/queue-5.4/series
index 2617f452dee2e2db99afa2b215e86701f5fca960..bdd4daa5d975135f598833d22c2ea3cc1026385e 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -133,3 +133,4 @@ nfc-pn533-fix-bulk-message-timeout.patch
 net-bpf-don-t-leak-time-wait-and-request-sockets.patch
 bpftool-fix-printing-incorrect-pointer-in-btf_dump_ptr.patch
 batman-adv-fix-dat-candidate-selection-on-little-endian-systems.patch
+macvlan-use-skb_reset_mac_header-in-macvlan_queue_xm.patch