From: Florian Fainelli <f.fainelli@gmail.com>
To: Andrew Lunn <andrew@lunn.ch>,
Romain Perier <romain.perier@collabora.com>
Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>,
Alexandre Torgue <alexandre.torgue@st.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 2/2] net: phy: Don't use drv when it is NULL in phy_attached_print
Date: Mon, 21 Aug 2017 17:46:39 -0700 [thread overview]
Message-ID: <0df9cbd4-30d8-2a30-07ee-bd0b38bd606b@gmail.com> (raw)
In-Reply-To: <20170821142426.GF1703@lunn.ch>
On 08/21/2017 07:24 AM, Andrew Lunn wrote:
> On Mon, Aug 21, 2017 at 01:45:30PM +0200, Romain Perier wrote:
>> Currently, if this logging function is used prior the phy driver is
>> bound to the phy device (that is usually done from .ndo_open),
>> 'phydev->drv' might be NULL, resulting in a kernel crash. That is
>> typically the case in the stmmac driver, info about the phy is displayed
>> during the registration of the MDIO bus, and then genphy driver is bound
>> to this phydev when .ndo_open is called.
>>
>> This commit fixes the issue by using the right genphy driver, when
>> phydev->drv is NULL.
>>
>> Fixes: fbca164776e4 ("net: stmmac: Use the right logging functi")
>> Signed-off-by: Romain Perier <romain.perier@collabora.com>
>> ---
>> drivers/net/phy/phy_device.c | 13 +++++++++++--
>> 1 file changed, 11 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
>> index 1790f7fec125..6af6dc6dfeaf 100644
>> --- a/drivers/net/phy/phy_device.c
>> +++ b/drivers/net/phy/phy_device.c
>> @@ -864,15 +864,24 @@ EXPORT_SYMBOL(phy_attached_info);
>> #define ATTACHED_FMT "attached PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)"
>> void phy_attached_print(struct phy_device *phydev, const char *fmt, ...)
>> {
>> + struct phy_driver *drv = phydev->drv;
>> +
>> + if (!drv) {
>> + if (phydev->is_c45)
>> + drv = &genphy_10g_driver;
>> + else
>> + drv = &genphy_driver;
>> + }
>> +
>
> As i said in my comment to v1, i don't like this.
Agreed, just use Andrew's earlier suggestion of checking phydev->drv
validity.
We don't have an equivalent of "unregistered" in the PHY layer, but
"unbound" seems like it could be what we want here.
Thanks
--
Florian
prev parent reply other threads:[~2017-08-22 0:46 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-21 11:45 [PATCH v2 0/2] net: stmmac: phy logging fixes Romain Perier
2017-08-21 11:45 ` [PATCH v2 1/2] net: stmmac: Delete dead code for MDIO registration Romain Perier
2017-08-22 0:45 ` Florian Fainelli
2017-08-22 12:00 ` Romain Perier
2017-08-21 11:45 ` [PATCH v2 2/2] net: phy: Don't use drv when it is NULL in phy_attached_print Romain Perier
2017-08-21 14:24 ` Andrew Lunn
2017-08-22 0:46 ` Florian Fainelli [this message]
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=0df9cbd4-30d8-2a30-07ee-bd0b38bd606b@gmail.com \
--to=f.fainelli@gmail.com \
--cc=alexandre.torgue@st.com \
--cc=andrew@lunn.ch \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=peppe.cavallaro@st.com \
--cc=romain.perier@collabora.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;
as well as URLs for NNTP newsgroup(s).