From: Heiner Kallweit <hkallweit1@gmail.com>
To: Florian Fainelli <f.fainelli@gmail.com>,
Andrew Lunn <andrew@lunn.ch>, David Miller <davem@davemloft.net>
Cc: "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
Geert Uytterhoeven <geert+renesas@glider.be>
Subject: [PATCH net-next 1/2] net: linkwatch: add check for netdevice being present to linkwatch_do_dev
Date: Tue, 18 Sep 2018 21:55:36 +0200 [thread overview]
Message-ID: <11beeaa9-57d5-e641-9486-f2ba202d0998@gmail.com> (raw)
In-Reply-To: <fc18a6b5-5022-ac2b-9e68-584b4c28bb71@gmail.com>
When bringing down the netdevice (incl. detaching it) and calling
netif_carrier_off directly or indirectly the latter triggers an
asynchronous linkwatch event.
This linkwatch event eventually may fail to access chip registers in
the ndo_get_stats/ndo_get_stats64 callback because the device isn't
accessible any longer, see call trace in [0].
To prevent this scenario don't check for IFF_UP only, but also make
sure that the netdevice is present.
[0] https://lists.openwall.net/netdev/2018/03/15/62
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
net/core/link_watch.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/core/link_watch.c b/net/core/link_watch.c
index e38e641e9..7f51efb2b 100644
--- a/net/core/link_watch.c
+++ b/net/core/link_watch.c
@@ -155,7 +155,7 @@ static void linkwatch_do_dev(struct net_device *dev)
clear_bit(__LINK_STATE_LINKWATCH_PENDING, &dev->state);
rfc2863_policy(dev);
- if (dev->flags & IFF_UP) {
+ if (dev->flags & IFF_UP && netif_device_present(dev)) {
if (netif_carrier_ok(dev))
dev_activate(dev);
else
--
2.19.0
next prev parent reply other threads:[~2018-09-19 1:30 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-18 19:54 [PATCH net-next 0/2] net: phy: make phy_stop() synchronous Heiner Kallweit
2018-09-18 19:55 ` Heiner Kallweit [this message]
2018-09-19 8:48 ` [PATCH net-next 1/2] net: linkwatch: add check for netdevice being present to linkwatch_do_dev Geert Uytterhoeven
2018-09-20 0:03 ` Florian Fainelli
2018-09-18 19:56 ` [PATCH net-next 2/2] net: phy: call state machine synchronously in phy_stop Heiner Kallweit
2018-09-19 8:49 ` Geert Uytterhoeven
2018-09-20 0:03 ` Florian Fainelli
2018-09-20 4:07 ` [PATCH net-next 0/2] net: phy: make phy_stop() synchronous David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=11beeaa9-57d5-e641-9486-f2ba202d0998@gmail.com \
--to=hkallweit1@gmail.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=geert+renesas@glider.be \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).