From: Ben Hutchings <ben@decadent.org.uk>
To: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: David Miller <davem@davemloft.net>,
Florian Fainelli <f.fainelli@gmail.com>,
netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3] net: phy: fix uninitalized WOL parameters in phy_ethtool_get_wol
Date: Thu, 13 Mar 2014 02:21:45 +0000 [thread overview]
Message-ID: <1394677305.20857.29.camel@deadeye.wl.decadent.org.uk> (raw)
In-Reply-To: <1394578975-12588-1-git-send-email-sebastian.hesselbarth@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 2445 bytes --]
On Wed, 2014-03-12 at 00:02 +0100, Sebastian Hesselbarth wrote:
> phy_ethtool_get_wol is a helper to get current WOL settings from
> a phy device. When using this helper on a PHY without .get_wol
> callback, struct ethtool_wolinfo is never set-up correctly and
> may contain misleading information about WOL status.
>
> To fix this, always zero relevant fields of struct ethtool_wolinfo
> regardless of .get_wol callback availability.
Sorry, I still disagree with this.
You're trying to make phy_ethtool_get_wol() do two subtly different
things:
- Provide an implementation of ethtool_ops::get_wol, leaving the net
driver only to look up phy_device
- Provide a standalone function for executing ETHTOOL_GWOL on a
phy_device
You may notice that phy_suspend() already sets wol.cmd = ETHTOOL_GWOL.
So it seems to me like it's taking responsibility for initialising the
structure like ethtool_get_wol() does. The bug is then that
phy_suspend() doesn't clear the rest of the structure. That is not the
responsibility of phy_ethtool_get_wol().
Ben.
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
> ---
> Changelog:
> v1->v2:
> - clear whole struct ethtool_wolinfo
> - check for non-NULL phy_device
> v2->v3:
> - only clear ->supported and ->wolopts (Suggested by Ben Hutchings)
>
> Cc: David Miller <davem@davemloft.net>
> Cc: Florian Fainelli <f.fainelli@gmail.com>
> Cc: Ben Hutchings <ben@decadent.org.uk>
> Cc: netdev@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-kernel@vger.kernel.org
> ---
> drivers/net/phy/phy.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
> index 19c9eca0ef26..94234a91a50f 100644
> --- a/drivers/net/phy/phy.c
> +++ b/drivers/net/phy/phy.c
> @@ -1092,7 +1092,9 @@ EXPORT_SYMBOL(phy_ethtool_set_wol);
>
> void phy_ethtool_get_wol(struct phy_device *phydev, struct ethtool_wolinfo *wol)
> {
> - if (phydev->drv->get_wol)
> + wol->supported = wol->wolopts = 0;
> +
> + if (phydev && phydev->drv->get_wol)
> phydev->drv->get_wol(phydev, wol);
> }
> EXPORT_SYMBOL(phy_ethtool_get_wol);
--
Ben Hutchings
Experience is directly proportional to the value of equipment destroyed.
- Carolyn Scheppner
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 811 bytes --]
next prev parent reply other threads:[~2014-03-13 2:21 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-10 1:01 [PATCH] " Sebastian Hesselbarth
2014-03-10 2:51 ` Ben Hutchings
2014-03-10 10:49 ` Sebastian Hesselbarth
2014-03-10 20:23 ` David Miller
2014-03-10 23:18 ` Ben Hutchings
2014-03-10 23:17 ` Ben Hutchings
2014-03-11 8:40 ` Sebastian Hesselbarth
2014-03-10 20:50 ` [PATCH v2 0/3] net: phy: fix uninitalized WOL struct " Sebastian Hesselbarth
2014-03-10 20:50 ` [PATCH v2 1/3] net: phy: fix uninitalized WOL parameters " Sebastian Hesselbarth
2014-03-11 23:02 ` [PATCH v3] " Sebastian Hesselbarth
2014-03-13 2:21 ` Ben Hutchings [this message]
2014-03-13 10:14 ` Sebastian Hesselbarth
2014-03-13 19:38 ` David Miller
2014-03-14 9:06 ` Sebastian Hesselbarth
2014-03-14 9:07 ` [PATCH] net: phy: fix uninitalized ethtool_wolinfo in phy_suspend Sebastian Hesselbarth
2014-03-14 14:18 ` Ben Hutchings
2014-03-15 2:39 ` David Miller
2014-03-15 10:01 ` [PATCH v3] net: phy: fix uninitalized WOL parameters in phy_ethtool_get_wol Sebastian Hesselbarth
2014-03-10 20:51 ` [PATCH v2 2/3] net: mv643xx_eth: simplify phy_ethtool_get_wol call Sebastian Hesselbarth
2014-03-10 20:51 ` [PATCH v2 3/3] net: cpsw: " Sebastian Hesselbarth
2014-03-10 22:20 ` [PATCH v2 0/3] net: phy: fix uninitalized WOL struct in phy_ethtool_get_wol Florian Fainelli
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=1394677305.20857.29.camel@deadeye.wl.decadent.org.uk \
--to=ben@decadent.org.uk \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sebastian.hesselbarth@gmail.com \
/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
all inboxes | Powered by JetHome®