From: sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3] net: phy: fix uninitalized WOL parameters in phy_ethtool_get_wol
Date: Fri, 14 Mar 2014 10:06:58 +0100 [thread overview]
Message-ID: <5322C6B2.6040905@gmail.com> (raw)
In-Reply-To: <20140313.153832.967564223480298567.davem@davemloft.net>
On 03/13/2014 08:38 PM, David Miller wrote:
> From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Date: Wed, 12 Mar 2014 00:02:55 +0100
>
>> 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.
>>
>> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
>> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
>
> I'm starting to see this situation more clearly now, especially with
> Ben's most recent commentary.
>
> The basic notion is that one must do ethtool ops are designed such that
> the top-level execution context in net/core/ethtool.c takes care of
> initializing the structure.
>
> In this case, we're referring specifically to ethtool_get_wol(), which
> runs any time ETHTOOL_GWOL is requested.
>
> Therefore no ethtool_ops->get_wol() implementation should duplicate
> this work, that goes for all of such cases which invoke the function
> we are talking about here, phy_ethtool_get_wol().
>
> So the first change is definitely to remove:
>
> wol->supported = 0;
> wol->wolopts = 0;
>
> from:
>
> drivers/net/ethernet/marvell/mv643xx_eth.c:mv643xx_eth_get_wol()
> drivers/net/ethernet/ti/cpsw.c:cpsw_get_wol()
>
> Next, I think phy_suspend() must create the same environment the
> call sites above guarentee for phy_ethtool_get_wol(), namely
> by changing the declaration of 'wol' to:
>
> struct ethtool_wolinfo wol = { .cmd = ETHTOOL_GWOL };
>
> which will cause the compiler to clear out the rest of the structure
> for us, as the same declaration does in ethtool_get_wol().
>
> Finally, purge the spurious clears in phydev_ops->get_wol(), namely
> in at803x_get_wol() and m88e1318_get_wol().
>
> So, to reiterate, OPS never have to be mindful of initializing the
> ethtool result with zeros. However, anyone who calls into OPS
> directly must provide said expected state.
>
> Are we all on the same page now?
Yes, we are. I'll send a fix for phy_suspend in a minute - still based
on v3.14-rc1 in case there will be another -rc.
If not, I'll rebase that fix on net-next together with patches for the
four offending drivers you named above.
Sebastian
WARNING: multiple messages have this Message-ID (diff)
From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
To: David Miller <davem@davemloft.net>
Cc: f.fainelli@gmail.com, ben@decadent.org.uk,
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: Fri, 14 Mar 2014 10:06:58 +0100 [thread overview]
Message-ID: <5322C6B2.6040905@gmail.com> (raw)
In-Reply-To: <20140313.153832.967564223480298567.davem@davemloft.net>
On 03/13/2014 08:38 PM, David Miller wrote:
> From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Date: Wed, 12 Mar 2014 00:02:55 +0100
>
>> 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.
>>
>> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
>> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
>
> I'm starting to see this situation more clearly now, especially with
> Ben's most recent commentary.
>
> The basic notion is that one must do ethtool ops are designed such that
> the top-level execution context in net/core/ethtool.c takes care of
> initializing the structure.
>
> In this case, we're referring specifically to ethtool_get_wol(), which
> runs any time ETHTOOL_GWOL is requested.
>
> Therefore no ethtool_ops->get_wol() implementation should duplicate
> this work, that goes for all of such cases which invoke the function
> we are talking about here, phy_ethtool_get_wol().
>
> So the first change is definitely to remove:
>
> wol->supported = 0;
> wol->wolopts = 0;
>
> from:
>
> drivers/net/ethernet/marvell/mv643xx_eth.c:mv643xx_eth_get_wol()
> drivers/net/ethernet/ti/cpsw.c:cpsw_get_wol()
>
> Next, I think phy_suspend() must create the same environment the
> call sites above guarentee for phy_ethtool_get_wol(), namely
> by changing the declaration of 'wol' to:
>
> struct ethtool_wolinfo wol = { .cmd = ETHTOOL_GWOL };
>
> which will cause the compiler to clear out the rest of the structure
> for us, as the same declaration does in ethtool_get_wol().
>
> Finally, purge the spurious clears in phydev_ops->get_wol(), namely
> in at803x_get_wol() and m88e1318_get_wol().
>
> So, to reiterate, OPS never have to be mindful of initializing the
> ethtool result with zeros. However, anyone who calls into OPS
> directly must provide said expected state.
>
> Are we all on the same page now?
Yes, we are. I'll send a fix for phy_suspend in a minute - still based
on v3.14-rc1 in case there will be another -rc.
If not, I'll rebase that fix on net-next together with patches for the
four offending drivers you named above.
Sebastian
WARNING: multiple messages have this Message-ID (diff)
From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, f.fainelli@gmail.com,
ben@decadent.org.uk, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v3] net: phy: fix uninitalized WOL parameters in phy_ethtool_get_wol
Date: Fri, 14 Mar 2014 10:06:58 +0100 [thread overview]
Message-ID: <5322C6B2.6040905@gmail.com> (raw)
In-Reply-To: <20140313.153832.967564223480298567.davem@davemloft.net>
On 03/13/2014 08:38 PM, David Miller wrote:
> From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Date: Wed, 12 Mar 2014 00:02:55 +0100
>
>> 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.
>>
>> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
>> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
>
> I'm starting to see this situation more clearly now, especially with
> Ben's most recent commentary.
>
> The basic notion is that one must do ethtool ops are designed such that
> the top-level execution context in net/core/ethtool.c takes care of
> initializing the structure.
>
> In this case, we're referring specifically to ethtool_get_wol(), which
> runs any time ETHTOOL_GWOL is requested.
>
> Therefore no ethtool_ops->get_wol() implementation should duplicate
> this work, that goes for all of such cases which invoke the function
> we are talking about here, phy_ethtool_get_wol().
>
> So the first change is definitely to remove:
>
> wol->supported = 0;
> wol->wolopts = 0;
>
> from:
>
> drivers/net/ethernet/marvell/mv643xx_eth.c:mv643xx_eth_get_wol()
> drivers/net/ethernet/ti/cpsw.c:cpsw_get_wol()
>
> Next, I think phy_suspend() must create the same environment the
> call sites above guarentee for phy_ethtool_get_wol(), namely
> by changing the declaration of 'wol' to:
>
> struct ethtool_wolinfo wol = { .cmd = ETHTOOL_GWOL };
>
> which will cause the compiler to clear out the rest of the structure
> for us, as the same declaration does in ethtool_get_wol().
>
> Finally, purge the spurious clears in phydev_ops->get_wol(), namely
> in at803x_get_wol() and m88e1318_get_wol().
>
> So, to reiterate, OPS never have to be mindful of initializing the
> ethtool result with zeros. However, anyone who calls into OPS
> directly must provide said expected state.
>
> Are we all on the same page now?
Yes, we are. I'll send a fix for phy_suspend in a minute - still based
on v3.14-rc1 in case there will be another -rc.
If not, I'll rebase that fix on net-next together with patches for the
four offending drivers you named above.
Sebastian
next prev parent reply other threads:[~2014-03-14 9:06 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-10 1:01 [PATCH] net: phy: fix uninitalized WOL parameters in phy_ethtool_get_wol Sebastian Hesselbarth
2014-03-10 1:01 ` Sebastian Hesselbarth
2014-03-10 2:51 ` Ben Hutchings
2014-03-10 2:51 ` Ben Hutchings
2014-03-10 2:51 ` Ben Hutchings
2014-03-10 10:49 ` Sebastian Hesselbarth
2014-03-10 10:49 ` Sebastian Hesselbarth
2014-03-10 20:23 ` David Miller
2014-03-10 20:23 ` David Miller
2014-03-10 23:18 ` Ben Hutchings
2014-03-10 23:18 ` Ben Hutchings
2014-03-10 23:17 ` Ben Hutchings
2014-03-10 23:17 ` Ben Hutchings
2014-03-11 8:40 ` Sebastian Hesselbarth
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 ` Sebastian Hesselbarth
2014-03-10 20:50 ` [PATCH v2 1/3] net: phy: fix uninitalized WOL parameters " Sebastian Hesselbarth
2014-03-10 20:50 ` Sebastian Hesselbarth
2014-03-11 23:02 ` [PATCH v3] " Sebastian Hesselbarth
2014-03-11 23:02 ` Sebastian Hesselbarth
2014-03-13 2:21 ` Ben Hutchings
2014-03-13 2:21 ` Ben Hutchings
2014-03-13 10:14 ` Sebastian Hesselbarth
2014-03-13 10:14 ` Sebastian Hesselbarth
2014-03-13 19:38 ` David Miller
2014-03-13 19:38 ` David Miller
2014-03-14 9:06 ` Sebastian Hesselbarth [this message]
2014-03-14 9:06 ` Sebastian Hesselbarth
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 9:07 ` Sebastian Hesselbarth
2014-03-14 14:18 ` Ben Hutchings
2014-03-14 14:18 ` Ben Hutchings
2014-03-15 2:39 ` David Miller
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-15 10:01 ` 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 ` Sebastian Hesselbarth
2014-03-10 20:51 ` [PATCH v2 3/3] net: cpsw: " Sebastian Hesselbarth
2014-03-10 20:51 ` Sebastian Hesselbarth
2014-03-10 22:20 ` [PATCH v2 0/3] net: phy: fix uninitalized WOL struct in phy_ethtool_get_wol Florian Fainelli
2014-03-10 22:20 ` 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=5322C6B2.6040905@gmail.com \
--to=sebastian.hesselbarth@gmail.com \
--cc=linux-arm-kernel@lists.infradead.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.