[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1394419893.15968.88.camel@deadeye.wl.decadent.org.uk>
Date: Mon, 10 Mar 2014 02:51:33 +0000
From: Ben Hutchings <ben@...adent.org.uk>
To: Sebastian Hesselbarth <sebastian.hesselbarth@...il.com>
Cc: David Miller <davem@...emloft.net>,
Florian Fainelli <f.fainelli@...il.com>,
netdev@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH] net: phy: fix uninitalized WOL parameters in
phy_ethtool_get_wol
On Mon, 2014-03-10 at 02:01 +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.
I think it's the caller's responsibility to zero out struct
ethtool_wolinfo. That is what ethtool_get_wol() does.
Maybe you could split ethtool_get_wol() like we did
ethtool_get_settings(), to support in-kernel invocation of ETHTOOL_GWOL?
Ben.
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@...il.com>
> ---
> Cc: David Miller <davem@...emloft.net>
> Cc: Florian Fainelli <f.fainelli@...il.com>
> Cc: netdev@...r.kernel.org
> Cc: linux-arm-kernel@...ts.infradead.org
> Cc: linux-kernel@...r.kernel.org
> ---
> drivers/net/phy/phy.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
> index 19c9eca0ef26..62a7cd401e1c 100644
> --- a/drivers/net/phy/phy.c
> +++ b/drivers/net/phy/phy.c
> @@ -1092,6 +1092,7 @@ EXPORT_SYMBOL(phy_ethtool_set_wol);
>
> void phy_ethtool_get_wol(struct phy_device *phydev, struct ethtool_wolinfo *wol)
> {
> + wol->supported = wol->wolopts = 0;
> if (phydev->drv->get_wol)
> phydev->drv->get_wol(phydev, wol);
> }
--
Ben Hutchings
Computers are not intelligent. They only think they are.
Download attachment "signature.asc" of type "application/pgp-signature" (812 bytes)
Powered by blists - more mailing lists