netdev - Re: [PATCH net] net: phy: re-apply PHY fixups during phy_register

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 29 Jul 2014 00:13:06 +0200
From:	Jonas Gorski <jogo@...nwrt.org>
To:	Florian Fainelli <f.fainelli@...il.com>
Cc:	netdev@...r.kernel.org, davem@...emloft.net, hauke@...ke-m.de
Subject: Re: [PATCH net] net: phy: re-apply PHY fixups during
 phy_register_device

On Mon, 28 Jul 2014 14:57:25 -0700
Florian Fainelli <f.fainelli@...il.com> wrote:

> Commit 87aa9f9c61ad ("net: phy: consolidate PHY reset in phy_init_hw()")
> moved the call to phy_scan_fixups() in phy_init_hw() after a software
> reset is performed.
> 
> This broke PHY drivers which do register an early PHY fixup callback to
> intercept the PHY probing and do things like changing the 32-bits unique
> PHY identifier when a pseudo-PHY address has been used.
> 
> Reported-by: Hauke Mehrtens <hauke@...ke-m.de>
> Reported-by: Jonas Gorski <jogo@...nwrt.org>
> Signed-off-by: Florian Fainelli <f.fainelli@...il.com>
> ---
> This changes is applicable to 3.14+ thanks!
> 
>  drivers/net/phy/phy_device.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
> index 74a82328dd49..1759d54682c8 100644
> --- a/drivers/net/phy/phy_device.c
> +++ b/drivers/net/phy/phy_device.c
> @@ -355,6 +355,7 @@ int phy_device_register(struct phy_device *phydev)
>  	phydev->bus->phy_map[phydev->addr] = phydev;
>  
>  	/* Run all of the fixups for this PHY */
> +	phy_scan_fixups(phydev);
>  	err = phy_init_hw(phydev);

You can safely remove the call to phy_init_hw(), as it will do nothing:

int phy_init_hw(struct phy_device *phydev)
{
        int ret = 0;

        if (!phydev->drv || ...) <- always true at this point
                return 0;


Also you should check the return value of phy_scan_fixups.

>  	if (err) {
>  		pr_err("PHY %d failed to initialize\n", phydev->addr);

So this can be actually hit.



Jonas
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html