linux-kernel - Re: [PATCH 3.14 40/84] stmmac: fix check for phydev being open

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <560BC5F0.2000901@cogentembedded.com>
Date:	Wed, 30 Sep 2015 14:22:24 +0300
From:	Sergei Shtylyov <sergei.shtylyov@...entembedded.com>
To:	Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
	linux-kernel@...r.kernel.org
Cc:	stable@...r.kernel.org,
	Giuseppe Cavallaro <peppe.cavallaro@...com>,
	David Miller <davem@...emloft.net>,
	Alexey Brodkin <abrodkin@...opsys.com>
Subject: Re: [PATCH 3.14 40/84] stmmac: fix check for phydev being open

Hello.

On 9/29/2015 6:18 PM, Greg Kroah-Hartman wrote:

> 3.14-stable review patch.  If anyone has any objections, please let me know.

    NAK on the same grounds as the 3.10 patch.

> ------------------
>
> From: Alexey Brodkin <Alexey.Brodkin@...opsys.com>
>
> commit dfc50fcaad574e5c8c85cbc83eca1426b2413fa4 upstream.
>
> Current check of phydev with IS_ERR(phydev) may make not much sense
> because of_phy_connect() returns NULL on failure instead of error value.
>
> Still for checking result of phy_connect() IS_ERR() makes perfect sense.
>
> So let's use combined check IS_ERR_OR_NULL() that covers both cases.
>
> Cc: Sergei Shtylyov <sergei.shtylyov@...entembedded.com>
> Cc: Giuseppe Cavallaro <peppe.cavallaro@...com>
> Cc: linux-kernel@...r.kernel.org
> Cc: David Miller <davem@...emloft.net>
> Signed-off-by: Alexey Brodkin <abrodkin@...opsys.com>
> Signed-off-by: David S. Miller <davem@...emloft.net>
> Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
>
> ---
>   drivers/net/ethernet/stmicro/stmmac/stmmac_main.c |    5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
>
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> @@ -810,8 +810,11 @@ static int stmmac_init_phy(struct net_de
>
>   	phydev = phy_connect(dev, phy_id_fmt, &stmmac_adjust_link, interface);

    If you really read the change log and compare it with the code, it's 
obviousl that the patch is not needed.

>
> -	if (IS_ERR(phydev)) {
> +	if (IS_ERR_OR_NULL(phydev)) {
>   		pr_err("%s: Could not attach to PHY\n", dev->name);
> +		if (!phydev)
> +			return -ENODEV;
> +
>   		return PTR_ERR(phydev);
>   	}
>

MBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/