4.14-stable patches

added patches:
	net-phylink-avoid-resolving-link-state-too-early.patch

diff --git a/queue-4.14/net-phylink-avoid-resolving-link-state-too-early.patch b/queue-4.14/net-phylink-avoid-resolving-link-state-too-early.patch
new file mode 100644 (file)
index 0000000..57d4ed2
--- /dev/null
+++ b/queue-4.14/net-phylink-avoid-resolving-link-state-too-early.patch
@@ -0,0 +1,70 @@
+From 87454b6edc1b0143fdb3d9853285477e95af74a4 Mon Sep 17 00:00:00 2001
+From: Russell King <rmk+kernel@armlinux.org.uk>
+Date: Mon, 11 Feb 2019 15:04:24 +0000
+Subject: net: phylink: avoid resolving link state too early
+
+From: Russell King <rmk+kernel@armlinux.org.uk>
+
+commit 87454b6edc1b0143fdb3d9853285477e95af74a4 upstream.
+
+During testing on Armada 388 platforms, it was found with a certain
+module configuration that it was possible to trigger a kernel oops
+during the module load process, caused by the phylink resolver being
+triggered for a currently disabled interface.
+
+This problem was introduced by changing the way the SFP registration
+works, which now can result in the sfp link down notification being
+called during phylink_create().
+
+Fixes: b5bfc21af5cb ("net: sfp: do not probe SFP module before we're attached")
+Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Cc: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/phy/phylink.c |   19 +++++++++++++------
+ 1 file changed, 13 insertions(+), 6 deletions(-)
+
+--- a/drivers/net/phy/phylink.c
++++ b/drivers/net/phy/phylink.c
+@@ -487,6 +487,17 @@ static void phylink_run_resolve(struct p
+               queue_work(system_power_efficient_wq, &pl->resolve);
+ }
+ 
++static void phylink_run_resolve_and_disable(struct phylink *pl, int bit)
++{
++      unsigned long state = pl->phylink_disable_state;
++
++      set_bit(bit, &pl->phylink_disable_state);
++      if (state == 0) {
++              queue_work(system_power_efficient_wq, &pl->resolve);
++              flush_work(&pl->resolve);
++      }
++}
++
+ static const struct sfp_upstream_ops sfp_phylink_ops;
+ 
+ static int phylink_register_sfp(struct phylink *pl, struct device_node *np)
+@@ -776,9 +787,7 @@ void phylink_stop(struct phylink *pl)
+       if (pl->sfp_bus)
+               sfp_upstream_stop(pl->sfp_bus);
+ 
+-      set_bit(PHYLINK_DISABLE_STOPPED, &pl->phylink_disable_state);
+-      queue_work(system_power_efficient_wq, &pl->resolve);
+-      flush_work(&pl->resolve);
++      phylink_run_resolve_and_disable(pl, PHYLINK_DISABLE_STOPPED);
+ }
+ EXPORT_SYMBOL_GPL(phylink_stop);
+ 
+@@ -1433,9 +1442,7 @@ static void phylink_sfp_link_down(void *
+ 
+       WARN_ON(!lockdep_rtnl_is_held());
+ 
+-      set_bit(PHYLINK_DISABLE_LINK, &pl->phylink_disable_state);
+-      queue_work(system_power_efficient_wq, &pl->resolve);
+-      flush_work(&pl->resolve);
++      phylink_run_resolve_and_disable(pl, PHYLINK_DISABLE_LINK);
+ }
+ 
+ static void phylink_sfp_link_up(void *upstream)

diff --git a/queue-4.14/series b/queue-4.14/series
index f9c5a9cd435d3da86230f90380d2fadd11c577a8..d067690a70eaa94a9ec51e707c1cca2dfbf8dc51 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -69,3 +69,4 @@ netfilter-ipv6-don-t-preserve-original-oif-for-loopback-address.patch
 pinctrl-max77620-use-define-directive-for-max77620_pinconf_param-values.patch
 phy-tegra-remove-redundant-self-assignment-of-map.patch
 sched-sysctl-fix-attributes-of-some-extern-declarations.patch
+net-phylink-avoid-resolving-link-state-too-early.patch