2022-12-07 14:59:34

by Anastasia Belova

[permalink] [raw]
Subject: [PATCH v2 2/2] MIPS: BCM63xx: Add check for NULL for clk in clk_enable

Errors from previous version of patch fixed.
Check clk for NULL before calling clk_enable_unlocked where clk
is dereferenced. There is such check in other implementations
of clk_enable.

Found by Linux Verification Center (linuxtesting.org) with SVACE.
Fixes: e7300d04bd08 ("MIPS: BCM63xx: Add support for the Broadcom BCM63xx family of SOCs.")
Reported-by: kernel test robot <[email protected]>
Signed-off-by: Anastasia Belova <[email protected]>
---
arch/mips/bcm63xx/clk.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/mips/bcm63xx/clk.c b/arch/mips/bcm63xx/clk.c
index 401140cf36d9..cf303d6e6693 100644
--- a/arch/mips/bcm63xx/clk.c
+++ b/arch/mips/bcm63xx/clk.c
@@ -362,7 +362,7 @@ static struct clk clk_periph = {
int clk_enable(struct clk *clk)
{
if (!clk)
- return;
+ return 0;

mutex_lock(&clocks_mutex);
clk_enable_unlocked(clk);
--
2.30.2


2022-12-07 16:36:56

by Alexey Khoroshilov

[permalink] [raw]
Subject: Re: [lvc-project] [PATCH v2 2/2] MIPS: BCM63xx: Add check for NULL for clk in clk_enable

On 07.12.2022 17:28, Anastasia Belova wrote:
> Errors from previous version of patch fixed.
> Check clk for NULL before calling clk_enable_unlocked where clk
> is dereferenced. There is such check in other implementations
> of clk_enable.
>
> Found by Linux Verification Center (linuxtesting.org) with SVACE.
> Fixes: e7300d04bd08 ("MIPS: BCM63xx: Add support for the Broadcom BCM63xx family of SOCs.")
> Reported-by: kernel test robot <[email protected]>
> Signed-off-by: Anastasia Belova <[email protected]>
> ---
> arch/mips/bcm63xx/clk.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/mips/bcm63xx/clk.c b/arch/mips/bcm63xx/clk.c
> index 401140cf36d9..cf303d6e6693 100644
> --- a/arch/mips/bcm63xx/clk.c
> +++ b/arch/mips/bcm63xx/clk.c
> @@ -362,7 +362,7 @@ static struct clk clk_periph = {
> int clk_enable(struct clk *clk)
> {
> if (!clk)
> - return;
> + return 0;
>
> mutex_lock(&clocks_mutex);
> clk_enable_unlocked(clk);
>

Keeping in mind that the first patch is not applied yet, it does not
make sense to fix it by the second one. It is better to fix the first
patch itself by sending the next version.

--
Alexey

2022-12-07 18:33:56

by Florian Fainelli

[permalink] [raw]
Subject: Re: [lvc-project] [PATCH v2 2/2] MIPS: BCM63xx: Add check for NULL for clk in clk_enable

On 12/7/22 07:53, Alexey Khoroshilov wrote:
> On 07.12.2022 17:28, Anastasia Belova wrote:
>> Errors from previous version of patch fixed.
>> Check clk for NULL before calling clk_enable_unlocked where clk
>> is dereferenced. There is such check in other implementations
>> of clk_enable.
>>
>> Found by Linux Verification Center (linuxtesting.org) with SVACE.
>> Fixes: e7300d04bd08 ("MIPS: BCM63xx: Add support for the Broadcom BCM63xx family of SOCs.")
>> Reported-by: kernel test robot <[email protected]>
>> Signed-off-by: Anastasia Belova <[email protected]>
>> ---
>> arch/mips/bcm63xx/clk.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/arch/mips/bcm63xx/clk.c b/arch/mips/bcm63xx/clk.c
>> index 401140cf36d9..cf303d6e6693 100644
>> --- a/arch/mips/bcm63xx/clk.c
>> +++ b/arch/mips/bcm63xx/clk.c
>> @@ -362,7 +362,7 @@ static struct clk clk_periph = {
>> int clk_enable(struct clk *clk)
>> {
>> if (!clk)
>> - return;
>> + return 0;
>>
>> mutex_lock(&clocks_mutex);
>> clk_enable_unlocked(clk);
>>
>
> Keeping in mind that the first patch is not applied yet, it does not
> make sense to fix it by the second one. It is better to fix the first
> patch itself by sending the next version.

Exactly, you would to combine both patches into a single patch and send
that as a version 3 now.
--
Florian