linux-kernel - Re: [PATCH] net/ethernet: update ret when ptp

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: <fd46310f-0b4e-ac8b-b187-98438ee6bb60@ti.com>
Date:   Fri, 6 Nov 2020 13:34:04 +0200
From:   Grygorii Strashko <grygorii.strashko@...com>
To:     Wang Qing <wangqing@...o.com>,
        "David S. Miller" <davem@...emloft.net>,
        Jakub Kicinski <kuba@...nel.org>,
        Samuel Zou <zou_wei@...wei.com>,
        Kurt Kanzenbach <kurt@...utronix.de>,
        Richard Cochran <richardcochran@...il.com>,
        <netdev@...r.kernel.org>, <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] net/ethernet: update ret when ptp_clock is ERROR



On 06/11/2020 09:56, Wang Qing wrote:
> We always have to update the value of ret, otherwise the
>   error value may be the previous one.
> 
> Signed-off-by: Wang Qing <wangqing@...o.com>
> ---
>   drivers/net/ethernet/ti/am65-cpts.c | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ethernet/ti/am65-cpts.c b/drivers/net/ethernet/ti/am65-cpts.c
> index 75056c1..b77ff61
> --- a/drivers/net/ethernet/ti/am65-cpts.c
> +++ b/drivers/net/ethernet/ti/am65-cpts.c
> @@ -1001,8 +1001,7 @@ struct am65_cpts *am65_cpts_create(struct device *dev, void __iomem *regs,

there is
	cpts->ptp_clock = ptp_clock_register(&cpts->ptp_info, cpts->dev);


>   	if (IS_ERR_OR_NULL(cpts->ptp_clock)) {

And ptp_clock_register() can return NULL only if PTP support is disabled.
In which case, we should not even get here.

So, I'd propose to s/IS_ERR_OR_NULL/IS_ERR above,
and just assign ret = PTR_ERR(cpts->ptp_clock) here.

>   		dev_err(dev, "Failed to register ptp clk %ld\n",
>   			PTR_ERR(cpts->ptp_clock));
> -		if (!cpts->ptp_clock)
> -			ret = -ENODEV;
> +		ret = cpts->ptp_clock ? cpts->ptp_clock : (-ENODEV);
>   		goto refclk_disable;
>   	}
>   	cpts->phc_index = ptp_clock_index(cpts->ptp_clock);
> 

-- 
Best regards,
grygorii