From: Tiezhu Yang <yangtiezhu@loongson.cn>
To: Stephen Boyd <sboyd@kernel.org>,
Michael Turquette <mturquette@baylibre.com>
Cc: linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org,
Xuefeng Li <lixuefeng@loongson.cn>
Subject: Re: [PATCH v4 1/2] clk: hisilicon: Use correct return value about hisi_reset_init()
Date: Fri, 29 May 2020 10:03:54 +0800 [thread overview]
Message-ID: <be070b91-4954-c66c-970c-a64f72eb54dc@loongson.cn> (raw)
In-Reply-To: <159070775347.69627.5841986835404441281@swboyd.mtv.corp.google.com>
On 05/29/2020 07:15 AM, Stephen Boyd wrote:
> Quoting Tiezhu Yang (2020-05-27 19:27:42)
>> On 05/28/2020 03:06 AM, Stephen Boyd wrote:
>>> Quoting Tiezhu Yang (2020-05-27 07:39:21)
>>>> The return value about hisi_reset_init() is not correct, fix it.
>>>>
>>>> Fixes: e9a2310fb689 ("reset: hisilicon: fix potential NULL pointer dereference")
>>> hisi_reset_init() returns NULL on error in that commit. This patch
>>> doesn't make sense.
>> Hi Stephen,
>>
>> The initial aim of this patch is to use correct return value about
>> hisi_reset_init(), maybe NULL is OK, but the return value in this
>> patch is more accurate.
> The implementation of hisi_reset_init() that I see is this:
>
>
> struct hisi_reset_controller *rstc;
>
> rstc = devm_kmalloc(&pdev->dev, sizeof(*rstc), GFP_KERNEL);
> if (!rstc)
> return NULL;
>
> rstc->membase = devm_platform_ioremap_resource(pdev, 0);
> if (IS_ERR(rstc->membase))
> return NULL;
>
> spin_lock_init(&rstc->lock);
> rstc->rcdev.owner = THIS_MODULE;
> rstc->rcdev.ops = &hisi_reset_ops;
> rstc->rcdev.of_node = pdev->dev.of_node;
> rstc->rcdev.of_reset_n_cells = 2;
> rstc->rcdev.of_xlate = hisi_reset_of_xlate;
> reset_controller_register(&rstc->rcdev);
>
> return rstc;
>
> And that returns NULL on an error and a valid pointer on success.
> Changing the code to check the return value of hisi_reset_init() for an
> error pointer is simply wrong without updating hisi_reset_init() to
> return an error pointer on error. Where is the patch that changes
> hisi_reset_init() to return an error pointer?
Hi Stephen,
Do you mean the following changes?
diff --git a/drivers/clk/hisilicon/reset.c b/drivers/clk/hisilicon/reset.c
index 93cee17..c733e2e 100644
--- a/drivers/clk/hisilicon/reset.c
+++ b/drivers/clk/hisilicon/reset.c
@@ -93,11 +93,11 @@ struct hisi_reset_controller *hisi_reset_init(struct platform_device *pdev)
rstc = devm_kmalloc(&pdev->dev, sizeof(*rstc), GFP_KERNEL);
if (!rstc)
- return NULL;
+ return ERR_PTR(-ENOMEM);
rstc->membase = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(rstc->membase))
- return NULL;
+ return ERR_CAST(rstc->membase);
spin_lock_init(&rstc->lock);
rstc->rcdev.owner = THIS_MODULE;
devm_platform_ioremap_resource()
devm_ioremap_resource()
__devm_ioremap_resource()
By the way, we can see the comment of devm_ioremap_resource():
Usage example:
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(base))
return PTR_ERR(base);
next prev parent reply other threads:[~2020-05-29 2:04 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-27 14:39 Tiezhu Yang
2020-05-27 14:39 ` [PATCH v4 2/2] clk: Allow COMPILE_TEST for subdir hisilicon in Makefile Tiezhu Yang
2020-05-31 21:05 ` kbuild test robot
2020-06-02 1:43 ` Tiezhu Yang
2020-05-27 19:06 ` [PATCH v4 1/2] clk: hisilicon: Use correct return value about hisi_reset_init() Stephen Boyd
2020-05-28 2:27 ` Tiezhu Yang
2020-05-28 23:15 ` Stephen Boyd
2020-05-29 2:03 ` Tiezhu Yang [this message]
2020-05-29 3:58 ` Stephen Boyd
2020-05-29 4:02 ` Tiezhu Yang
2020-05-29 4:31 ` Stephen Boyd
2020-05-29 6:44 ` Tiezhu Yang
2020-05-29 9:36 ` Stephen Boyd
2020-05-29 10:20 ` Tiezhu Yang
2020-05-29 21:14 ` Stephen Boyd
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=be070b91-4954-c66c-970c-a64f72eb54dc@loongson.cn \
--to=yangtiezhu@loongson.cn \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lixuefeng@loongson.cn \
--cc=mturquette@baylibre.com \
--cc=sboyd@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®