4.9-stable patches

added patches:
	cx82310_eth-use-skb_cow_head-to-deal-with-cloned-skbs.patch
	lan78xx-use-skb_cow_head-to-deal-with-cloned-skbs.patch
	smsc75xx-use-skb_cow_head-to-deal-with-cloned-skbs.patch
	sr9700-use-skb_cow_head-to-deal-with-cloned-skbs.patch

diff --git a/queue-4.9/cx82310_eth-use-skb_cow_head-to-deal-with-cloned-skbs.patch b/queue-4.9/cx82310_eth-use-skb_cow_head-to-deal-with-cloned-skbs.patch
new file mode 100644 (file)
index 0000000..38e1762
--- /dev/null
+++ b/queue-4.9/cx82310_eth-use-skb_cow_head-to-deal-with-cloned-skbs.patch
@@ -0,0 +1,42 @@
+From a9e840a2081ed28c2b7caa6a9a0041c950b3c37d Mon Sep 17 00:00:00 2001
+From: Eric Dumazet <edumazet@google.com>
+Date: Wed, 19 Apr 2017 09:59:22 -0700
+Subject: cx82310_eth: use skb_cow_head() to deal with cloned skbs
+
+From: Eric Dumazet <edumazet@google.com>
+
+commit a9e840a2081ed28c2b7caa6a9a0041c950b3c37d upstream.
+
+We need to ensure there is enough headroom to push extra header,
+but we also need to check if we are allowed to change headers.
+
+skb_cow_head() is the proper helper to deal with this.
+
+Fixes: cc28a20e77b2 ("introduce cx82310_eth: Conexant CX82310-based ADSL router USB ethernet driver")
+Signed-off-by: Eric Dumazet <edumazet@google.com>
+Cc: James Hughes <james.hughes@raspberrypi.org>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Oliver Neukum <oneukum@suse.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/usb/cx82310_eth.c |    7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+--- a/drivers/net/usb/cx82310_eth.c
++++ b/drivers/net/usb/cx82310_eth.c
+@@ -293,12 +293,9 @@ static struct sk_buff *cx82310_tx_fixup(
+ {
+       int len = skb->len;
+ 
+-      if (skb_headroom(skb) < 2) {
+-              struct sk_buff *skb2 = skb_copy_expand(skb, 2, 0, flags);
++      if (skb_cow_head(skb, 2)) {
+               dev_kfree_skb_any(skb);
+-              skb = skb2;
+-              if (!skb)
+-                      return NULL;
++              return NULL;
+       }
+       skb_push(skb, 2);
+ 

diff --git a/queue-4.9/lan78xx-use-skb_cow_head-to-deal-with-cloned-skbs.patch b/queue-4.9/lan78xx-use-skb_cow_head-to-deal-with-cloned-skbs.patch
new file mode 100644 (file)
index 0000000..32b75e1
--- /dev/null
+++ b/queue-4.9/lan78xx-use-skb_cow_head-to-deal-with-cloned-skbs.patch
@@ -0,0 +1,45 @@
+From d4ca73591916b760478d2b04334d5dcadc028e9c Mon Sep 17 00:00:00 2001
+From: Eric Dumazet <edumazet@google.com>
+Date: Wed, 19 Apr 2017 09:59:24 -0700
+Subject: lan78xx: use skb_cow_head() to deal with cloned skbs
+
+From: Eric Dumazet <edumazet@google.com>
+
+commit d4ca73591916b760478d2b04334d5dcadc028e9c upstream.
+
+We need to ensure there is enough headroom to push extra header,
+but we also need to check if we are allowed to change headers.
+
+skb_cow_head() is the proper helper to deal with this.
+
+Fixes: 55d7de9de6c3 ("Microchip's LAN7800 family USB 2/3 to 10/100/1000 Ethernet device driver")
+Signed-off-by: Eric Dumazet <edumazet@google.com>
+Cc: James Hughes <james.hughes@raspberrypi.org>
+Cc: Woojung Huh <woojung.huh@microchip.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Oliver Neukum <oneukum@suse.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/usb/lan78xx.c |    9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+--- a/drivers/net/usb/lan78xx.c
++++ b/drivers/net/usb/lan78xx.c
+@@ -2419,14 +2419,9 @@ static struct sk_buff *lan78xx_tx_prep(s
+ {
+       u32 tx_cmd_a, tx_cmd_b;
+ 
+-      if (skb_headroom(skb) < TX_OVERHEAD) {
+-              struct sk_buff *skb2;
+-
+-              skb2 = skb_copy_expand(skb, TX_OVERHEAD, 0, flags);
++      if (skb_cow_head(skb, TX_OVERHEAD)) {
+               dev_kfree_skb_any(skb);
+-              skb = skb2;
+-              if (!skb)
+-                      return NULL;
++              return NULL;
+       }
+ 
+       if (lan78xx_linearize(skb) < 0)

diff --git a/queue-4.9/series b/queue-4.9/series
index f9d4e8a59062ecca518410d49a879d2fb8262028..c14b1fa5f8ca73fbe4c18dae2d8122bde363c250 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -23,3 +23,7 @@ alsa-aloop-fix-inconsistent-format-due-to-incomplete-rule.patch
 alsa-aloop-fix-racy-hw-constraints-adjustment.patch
 x86-acpi-reduce-code-duplication-in-mp_override_legacy_irq.patch
 zswap-don-t-param_set_charp-while-holding-spinlock.patch
+lan78xx-use-skb_cow_head-to-deal-with-cloned-skbs.patch
+sr9700-use-skb_cow_head-to-deal-with-cloned-skbs.patch
+smsc75xx-use-skb_cow_head-to-deal-with-cloned-skbs.patch
+cx82310_eth-use-skb_cow_head-to-deal-with-cloned-skbs.patch

diff --git a/queue-4.9/smsc75xx-use-skb_cow_head-to-deal-with-cloned-skbs.patch b/queue-4.9/smsc75xx-use-skb_cow_head-to-deal-with-cloned-skbs.patch
new file mode 100644 (file)
index 0000000..884108c
--- /dev/null
+++ b/queue-4.9/smsc75xx-use-skb_cow_head-to-deal-with-cloned-skbs.patch
@@ -0,0 +1,43 @@
+From b7c6d2675899cfff0180412c63fc9cbd5bacdb4d Mon Sep 17 00:00:00 2001
+From: Eric Dumazet <edumazet@google.com>
+Date: Wed, 19 Apr 2017 09:59:21 -0700
+Subject: smsc75xx: use skb_cow_head() to deal with cloned skbs
+
+From: Eric Dumazet <edumazet@google.com>
+
+commit b7c6d2675899cfff0180412c63fc9cbd5bacdb4d upstream.
+
+We need to ensure there is enough headroom to push extra header,
+but we also need to check if we are allowed to change headers.
+
+skb_cow_head() is the proper helper to deal with this.
+
+Fixes: d0cad871703b ("smsc75xx: SMSC LAN75xx USB gigabit ethernet adapter driver")
+Signed-off-by: Eric Dumazet <edumazet@google.com>
+Cc: James Hughes <james.hughes@raspberrypi.org>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Oliver Neukum <oneukum@suse.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/usb/smsc75xx.c |    8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+--- a/drivers/net/usb/smsc75xx.c
++++ b/drivers/net/usb/smsc75xx.c
+@@ -2205,13 +2205,9 @@ static struct sk_buff *smsc75xx_tx_fixup
+ {
+       u32 tx_cmd_a, tx_cmd_b;
+ 
+-      if (skb_headroom(skb) < SMSC75XX_TX_OVERHEAD) {
+-              struct sk_buff *skb2 =
+-                      skb_copy_expand(skb, SMSC75XX_TX_OVERHEAD, 0, flags);
++      if (skb_cow_head(skb, SMSC75XX_TX_OVERHEAD)) {
+               dev_kfree_skb_any(skb);
+-              skb = skb2;
+-              if (!skb)
+-                      return NULL;
++              return NULL;
+       }
+ 
+       tx_cmd_a = (u32)(skb->len & TX_CMD_A_LEN) | TX_CMD_A_FCS;

diff --git a/queue-4.9/sr9700-use-skb_cow_head-to-deal-with-cloned-skbs.patch b/queue-4.9/sr9700-use-skb_cow_head-to-deal-with-cloned-skbs.patch
new file mode 100644 (file)
index 0000000..933ae66
--- /dev/null
+++ b/queue-4.9/sr9700-use-skb_cow_head-to-deal-with-cloned-skbs.patch
@@ -0,0 +1,44 @@
+From d532c1082f68176363ed766d09bf187616e282fe Mon Sep 17 00:00:00 2001
+From: Eric Dumazet <edumazet@google.com>
+Date: Wed, 19 Apr 2017 09:59:23 -0700
+Subject: sr9700: use skb_cow_head() to deal with cloned skbs
+
+From: Eric Dumazet <edumazet@google.com>
+
+commit d532c1082f68176363ed766d09bf187616e282fe upstream.
+
+We need to ensure there is enough headroom to push extra header,
+but we also need to check if we are allowed to change headers.
+
+skb_cow_head() is the proper helper to deal with this.
+
+Fixes: c9b37458e956 ("USB2NET : SR9700 : One chip USB 1.1 USB2NET SR9700Device Driver Support")
+Signed-off-by: Eric Dumazet <edumazet@google.com>
+Cc: James Hughes <james.hughes@raspberrypi.org>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Oliver Neukum <oneukum@suse.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/usb/sr9700.c |    9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+--- a/drivers/net/usb/sr9700.c
++++ b/drivers/net/usb/sr9700.c
+@@ -456,14 +456,9 @@ static struct sk_buff *sr9700_tx_fixup(s
+ 
+       len = skb->len;
+ 
+-      if (skb_headroom(skb) < SR_TX_OVERHEAD) {
+-              struct sk_buff *skb2;
+-
+-              skb2 = skb_copy_expand(skb, SR_TX_OVERHEAD, 0, flags);
++      if (skb_cow_head(skb, SR_TX_OVERHEAD)) {
+               dev_kfree_skb_any(skb);
+-              skb = skb2;
+-              if (!skb)
+-                      return NULL;
++              return NULL;
+       }
+ 
+       __skb_push(skb, SR_TX_OVERHEAD);