* [PATCH v2 net] net: phy: sfp: Fix unregistering of HWMON SFP device
@ 2018-09-24 23:50 Andrew Lunn
2018-09-24 23:51 ` Florian Fainelli
2018-09-27 3:25 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Andrew Lunn @ 2018-09-24 23:50 UTC (permalink / raw)
To: David Miller; +Cc: netdev, Russell King, Florian Fainelli, Andrew Lunn
A HWMON device is only registered is the SFP module supports the
diagnostic page and is complient to SFF8472. Don't unconditionally
unregister the hwmon device when the SFP module is remove, otherwise
we access data structures which don't exist.
Reported-by: Florian Fainelli <f.fainelli@gmail.com>
Fixes: 1323061a018a ("net: phy: sfp: Add HWMON support for module sensors")
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
drivers/net/phy/sfp.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
index 52fffb98fde9..6e13b8832bc7 100644
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
@@ -1098,8 +1098,11 @@ static int sfp_hwmon_insert(struct sfp *sfp)
static void sfp_hwmon_remove(struct sfp *sfp)
{
- hwmon_device_unregister(sfp->hwmon_dev);
- kfree(sfp->hwmon_name);
+ if (!IS_ERR_OR_NULL(sfp->hwmon_dev)) {
+ hwmon_device_unregister(sfp->hwmon_dev);
+ sfp->hwmon_dev = NULL;
+ kfree(sfp->hwmon_name);
+ }
}
#else
static int sfp_hwmon_insert(struct sfp *sfp)
--
2.19.0.rc1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v2 net] net: phy: sfp: Fix unregistering of HWMON SFP device
2018-09-24 23:50 [PATCH v2 net] net: phy: sfp: Fix unregistering of HWMON SFP device Andrew Lunn
@ 2018-09-24 23:51 ` Florian Fainelli
2018-09-27 3:25 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Florian Fainelli @ 2018-09-24 23:51 UTC (permalink / raw)
To: Andrew Lunn, David Miller; +Cc: netdev, Russell King
On 09/24/2018 04:50 PM, Andrew Lunn wrote:
> A HWMON device is only registered is the SFP module supports the
> diagnostic page and is complient to SFF8472. Don't unconditionally
> unregister the hwmon device when the SFP module is remove, otherwise
> we access data structures which don't exist.
>
> Reported-by: Florian Fainelli <f.fainelli@gmail.com>
> Fixes: 1323061a018a ("net: phy: sfp: Add HWMON support for module sensors")
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Florian Fainelli <f.fainelli@gmail.com>
--
Florian
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v2 net] net: phy: sfp: Fix unregistering of HWMON SFP device
2018-09-24 23:50 [PATCH v2 net] net: phy: sfp: Fix unregistering of HWMON SFP device Andrew Lunn
2018-09-24 23:51 ` Florian Fainelli
@ 2018-09-27 3:25 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2018-09-27 3:25 UTC (permalink / raw)
To: andrew; +Cc: netdev, rmk+kernel, f.fainelli
From: Andrew Lunn <andrew@lunn.ch>
Date: Tue, 25 Sep 2018 01:50:00 +0200
> A HWMON device is only registered is the SFP module supports the
> diagnostic page and is complient to SFF8472. Don't unconditionally
> unregister the hwmon device when the SFP module is remove, otherwise
> we access data structures which don't exist.
>
> Reported-by: Florian Fainelli <f.fainelli@gmail.com>
> Fixes: 1323061a018a ("net: phy: sfp: Add HWMON support for module sensors")
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-09-27 9:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-24 23:50 [PATCH v2 net] net: phy: sfp: Fix unregistering of HWMON SFP device Andrew Lunn
2018-09-24 23:51 ` Florian Fainelli
2018-09-27 3:25 ` David Miller
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).