netdev - Re: [PATCH] phy: fix possible double lock calling link changed handler

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 linux-cve-announce PHC
Open Source and information security mailing list archives

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

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

Message-ID: <20211123193114.346852d6@work>
Date:   Tue, 23 Nov 2021 19:31:14 -0300
From:   Alessandro B Maurici <abmaurici@...il.com>
To:     Heiner Kallweit <hkallweit1@...il.com>
Cc:     netdev@...r.kernel.org, Russell King <linux@...linux.org.uk>,
        "David S. Miller" <davem@...emloft.net>,
        Andrew Lunn <andrew@...n.ch>
Subject: Re: [PATCH] phy: fix possible double lock calling link changed
 handler

On Tue, 23 Nov 2021 21:32:56 +0100
Heiner Kallweit <hkallweit1@...il.com> wrote:

> Great that you have test hw, could you please test the following patch?
> The duplex argument of lan743x_phy_update_flowcontrol() seems to be some
> leftover, it isn't used and can be removed.
> 
> 
> diff --git a/drivers/net/ethernet/microchip/lan743x_main.c b/drivers/net/ethernet/microchip/lan743x_main.c
> index 4fc97823b..7d7647481 100644
> --- a/drivers/net/ethernet/microchip/lan743x_main.c
> +++ b/drivers/net/ethernet/microchip/lan743x_main.c
> @@ -914,8 +914,7 @@ static int lan743x_phy_reset(struct lan743x_adapter *adapter)
>  }
>  
>  static void lan743x_phy_update_flowcontrol(struct lan743x_adapter *adapter,
> -					   u8 duplex, u16 local_adv,
> -					   u16 remote_adv)
> +					   u16 local_adv, u16 remote_adv)
>  {
>  	struct lan743x_phy *phy = &adapter->phy;
>  	u8 cap;
> @@ -943,7 +942,6 @@ static void lan743x_phy_link_status_change(struct net_device *netdev)
>  
>  	phy_print_status(phydev);
>  	if (phydev->state == PHY_RUNNING) {
> -		struct ethtool_link_ksettings ksettings;
>  		int remote_advertisement = 0;
>  		int local_advertisement = 0;
>  
> @@ -980,18 +978,14 @@ static void lan743x_phy_link_status_change(struct net_device *netdev)
>  		}
>  		lan743x_csr_write(adapter, MAC_CR, data);
>  
> -		memset(&ksettings, 0, sizeof(ksettings));
> -		phy_ethtool_get_link_ksettings(netdev, &ksettings);
>  		local_advertisement =
>  			linkmode_adv_to_mii_adv_t(phydev->advertising);
>  		remote_advertisement =
>  			linkmode_adv_to_mii_adv_t(phydev->lp_advertising);
>  
> -		lan743x_phy_update_flowcontrol(adapter,
> -					       ksettings.base.duplex,
> -					       local_advertisement,
> +		lan743x_phy_update_flowcontrol(adapter, local_advertisement,
>  					       remote_advertisement);
> -		lan743x_ptp_update_latency(adapter, ksettings.base.speed);
> +		lan743x_ptp_update_latency(adapter, phydev->speed);
>  	}
>  }
>  

Patch tested and working as expected.

Alessandro