linux-kernel - Re: [patch added to the 3.12 stable tree] 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]

Date:	Wed, 30 Sep 2015 14:28:23 +0300
From:	Sergei Shtylyov <sergei.shtylyov@...entembedded.com>
To:	Jiri Slaby <jslaby@...e.cz>, stable@...r.kernel.org
Cc:	Alexey Brodkin <Alexey.Brodkin@...opsys.com>,
	Giuseppe Cavallaro <peppe.cavallaro@...com>,
	linux-kernel@...r.kernel.org, David Miller <davem@...emloft.net>,
	Alexey Brodkin <abrodkin@...opsys.com>
Subject: Re: [patch added to the 3.12 stable tree] stmmac: fix check for
 phydev being open

On 9/30/2015 1:00 PM, Jiri Slaby wrote:

> From: Alexey Brodkin <Alexey.Brodkin@...opsys.com>

> This patch has been added to the 3.12 stable tree. If you have any
> objections, please let us know.

    I do -- of_phy_connect() isn't called in this version, so the patch is 
totally useless.

> ===============
>
> 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: Jiri Slaby <jslaby@...e.cz>
> ---
>   drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> index 8d4ccd35a016..14c0d31c10ad 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> @@ -801,8 +801,11 @@ static int stmmac_init_phy(struct net_device *dev)
>
>   	phydev = phy_connect(dev, phy_id_fmt, &stmmac_adjust_link, interface);
>
> -	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/