summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaura Abbott <labbott@fedoraproject.org>2017-01-17 13:37:23 -0800
committerLaura Abbott <labbott@fedoraproject.org>2017-01-17 13:37:23 -0800
commit7cf4b8dbe007601597b944a8d39f7d3a494f6115 (patch)
treeb61e3b29250ee6a0e557d4f8ce0293cac140a268
parentdaee1c09c5ca45186344d2658e2227cd4e8158da (diff)
downloadkernel-7cf4b8dbe007601597b944a8d39f7d3a494f6115.tar.gz
kernel-7cf4b8dbe007601597b944a8d39f7d3a494f6115.tar.xz
kernel-7cf4b8dbe007601597b944a8d39f7d3a494f6115.zip
Fix kubernetes networking issue (rhbz 1414068)
-rw-r--r--k8s-fix.patch39
-rw-r--r--kernel.spec6
2 files changed, 45 insertions, 0 deletions
diff --git a/k8s-fix.patch b/k8s-fix.patch
new file mode 100644
index 000000000..6a7aa52ef
--- /dev/null
+++ b/k8s-fix.patch
@@ -0,0 +1,39 @@
+From 14221cc45caad2fcab3a8543234bb7eda9b540d5 Mon Sep 17 00:00:00 2001
+From: Artur Molchanov <arturmolchanov@gmail.com>
+Date: Fri, 30 Dec 2016 19:46:36 +0300
+Subject: bridge: netfilter: Fix dropping packets that moving through bridge
+ interface
+
+Problem:
+br_nf_pre_routing_finish() calls itself instead of
+br_nf_pre_routing_finish_bridge(). Due to this bug reverse path filter drops
+packets that go through bridge interface.
+
+User impact:
+Local docker containers with bridge network can not communicate with each
+other.
+
+Fixes: c5136b15ea36 ("netfilter: bridge: add and use br_nf_hook_thresh")
+Signed-off-by: Artur Molchanov <artur.molchanov@synesis.ru>
+Acked-by: Florian Westphal <fw@strlen.de>
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+---
+ net/bridge/br_netfilter_hooks.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/net/bridge/br_netfilter_hooks.c b/net/bridge/br_netfilter_hooks.c
+index b12501a..135cc8a 100644
+--- a/net/bridge/br_netfilter_hooks.c
++++ b/net/bridge/br_netfilter_hooks.c
+@@ -399,7 +399,7 @@ bridged_dnat:
+ br_nf_hook_thresh(NF_BR_PRE_ROUTING,
+ net, sk, skb, skb->dev,
+ NULL,
+- br_nf_pre_routing_finish);
++ br_nf_pre_routing_finish_bridge);
+ return 0;
+ }
+ ether_addr_copy(eth_hdr(skb)->h_dest, dev->dev_addr);
+--
+cgit v0.12
+
diff --git a/kernel.spec b/kernel.spec
index 6b4f2bd77..f2836b1b7 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -640,6 +640,9 @@ Patch854: drm-amdgpu-update-si-kicker-smc-firmware.patch
Patch855: drm-radeon-drop-verde-dpm-quirks.patch
Patch856: drm-radeon-update-smc-firmware-selection-for-si.patch
+#rhbz 1414068
+Patch857: k8s-fix.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -2187,6 +2190,9 @@ fi
#
#
%changelog
+* Tue Jan 17 2017 Laura Abbott <labbott@fedoraproject.org>
+- Fix kubernetes networking issue (rhbz 1414068)
+
* Tue Jan 17 2017 Laura Abbott <labbott@fedoraproject.org> - 4.9.4-201
- Add possible ATI fixes