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

Message-Id: <1604720323-3586-1-git-send-email-wangqing@vivo.com>
Date:   Sat,  7 Nov 2020 11:38:38 +0800
From:   Wang Qing <wangqing@...o.com>
To:     "David S. Miller" <davem@...emloft.net>,
        Jakub Kicinski <kuba@...nel.org>,
        Grygorii Strashko <grygorii.strashko@...com>,
        Kurt Kanzenbach <kurt@...utronix.de>,
        Samuel Zou <zou_wei@...wei.com>,
        Murali Karicheri <m-karicheri2@...com>,
        Ivan Khoronzhuk <ivan.khoronzhuk@...aro.org>,
        Wang Qing <wangqing@...o.com>, netdev@...r.kernel.org,
        linux-kernel@...r.kernel.org
Subject: [V2] [PATCH] net/ethernet: update ret when ptp_clock is ERROR

We always have to update the value of ret, otherwise the error value
 may be the previous one. And ptp_clock_register() never return NULL
 when PTP_1588_CLOCK enable, so we use IS_ERR here.

Signed-off-by: Wang Qing <wangqing@...o.com>
---
 drivers/net/ethernet/ti/am65-cpts.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/ti/am65-cpts.c b/drivers/net/ethernet/ti/am65-cpts.c
index 75056c1..ec8e56d
--- a/drivers/net/ethernet/ti/am65-cpts.c
+++ b/drivers/net/ethernet/ti/am65-cpts.c
@@ -998,11 +998,10 @@ struct am65_cpts *am65_cpts_create(struct device *dev, void __iomem *regs,
 	am65_cpts_settime(cpts, ktime_to_ns(ktime_get_real()));
 
 	cpts->ptp_clock = ptp_clock_register(&cpts->ptp_info, cpts->dev);
-	if (IS_ERR_OR_NULL(cpts->ptp_clock)) {
+	if (IS_ERR(cpts->ptp_clock)) {
 		dev_err(dev, "Failed to register ptp clk %ld\n",
 			PTR_ERR(cpts->ptp_clock));
-		if (!cpts->ptp_clock)
-			ret = -ENODEV;
+		ret = PTR_ERR(cpts->ptp_clock);
 		goto refclk_disable;
 	}
 	cpts->phc_index = ptp_clock_index(cpts->ptp_clock);
-- 
2.7.4