revert LP#1705447 fix

see https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1715609

diff --git a/0001-Revert-net-reduce-skb_warn_bad_offload-noise.patch b/0001-Revert-net-reduce-skb_warn_bad_offload-noise.patch
new file mode 100644 (file)
index 0000000..46cb266
--- /dev/null
+++ b/0001-Revert-net-reduce-skb_warn_bad_offload-noise.patch
@@ -0,0 +1,51 @@
+From b776ff7db868804129b9f364825fd4e949a493ee Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
+Date: Tue, 19 Sep 2017 09:36:43 +0200
+Subject: [PATCH] Revert "net: reduce skb_warn_bad_offload() noise"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This reverts commit b2504a5dbef3305ef41988ad270b0e8ec289331c.
+
+Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
+---
+ net/core/dev.c | 12 +++---------
+ 1 file changed, 3 insertions(+), 9 deletions(-)
+
+diff --git a/net/core/dev.c b/net/core/dev.c
+index 73d5644fa834..7c8959936169 100644
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -2702,12 +2702,11 @@ static inline bool skb_needs_check(struct sk_buff *skb, bool tx_path)
+ struct sk_buff *__skb_gso_segment(struct sk_buff *skb,
+                                 netdev_features_t features, bool tx_path)
+ {
+-      struct sk_buff *segs;
+-
+       if (unlikely(skb_needs_check(skb, tx_path))) {
+               int err;
+ 
+-              /* We're going to init ->check field in TCP or UDP header */
++              skb_warn_bad_offload(skb);
++
+               err = skb_cow_head(skb, 0);
+               if (err < 0)
+                       return ERR_PTR(err);
+@@ -2735,12 +2734,7 @@ struct sk_buff *__skb_gso_segment(struct sk_buff *skb,
+       skb_reset_mac_header(skb);
+       skb_reset_mac_len(skb);
+ 
+-      segs = skb_mac_gso_segment(skb, features);
+-
+-      if (unlikely(skb_needs_check(skb, tx_path)))
+-              skb_warn_bad_offload(skb);
+-
+-      return segs;
++      return skb_mac_gso_segment(skb, features);
+ }
+ EXPORT_SYMBOL(__skb_gso_segment);
+ 
+-- 
+2.11.0
+

diff --git a/Makefile b/Makefile
index f0f4f1a190327cf1b942783e243d0d91c9d02e03..c5eaca52488a4ec2ab028939e064783e1599ceeb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -247,6 +247,7 @@ ${KERNEL_SRC}/README: ${KERNEL_SRC_SUBMODULE} | submodules
        cd ${KERNEL_SRC}; patch -p1 < ../0001-netfilter-nft_set_rbtree-handle-re-addition-element-.patch # DoS from within (unpriv) containers
        cd ${KERNEL_SRC}; patch -p1 < ../0001-block-fix-bio_will_gap-for-first-bvec-with-offset.patch
        cd ${KERNEL_SRC}; patch -p1 < ../0001-tcp-reset-sk_rx_dst-in-tcp_disconnect.patch
+       cd ${KERNEL_SRC}; patch -p1 < ../0001-Revert-net-reduce-skb_warn_bad_offload-noise.patch
        sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
        touch $@