[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <0eeb142e-1c74-44f8-9f58-365bee3a670f@ghiti.fr>
Date: Mon, 25 Mar 2024 21:45:59 +0100
From: Alexandre Ghiti <alex@...ti.fr>
To: Qingfang Deng <dqfext@...il.com>, Thomas Gleixner <tglx@...utronix.de>,
Palmer Dabbelt <palmer@...belt.com>, Paul Walmsley
<paul.walmsley@...ive.com>, Albert Ou <aou@...s.berkeley.edu>,
Atish Patra <atishp@...shpatra.org>, linux-kernel@...r.kernel.org,
linux-riscv@...ts.infradead.org
Cc: Christoph Hellwig <hch@....de>,
Qingfang Deng <qingfang.deng@...lower.com.cn>
Subject: Re: [PATCH] irqchip/sifive-plic: Fix error handling of
of_property_read_u32
Hi Qingfang,
On 22/03/2024 18:08, Alexandre Ghiti wrote:
> Hi Qingfang,
>
> On 22/03/2024 10:00, Qingfang Deng wrote:
>> From: Qingfang Deng <qingfang.deng@...lower.com.cn>
>>
>> nr_irqs will not be initialized if of_property_read_u32 returns an
>> error. Check the error first.
>>
>> Fixes: 8237f8bc4f6e ("irqchip: add a SiFive PLIC driver")
>> Signed-off-by: Qingfang Deng <qingfang.deng@...lower.com.cn>
>> ---
>> drivers/irqchip/irq-sifive-plic.c | 5 ++++-
>> 1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/irqchip/irq-sifive-plic.c
>> b/drivers/irqchip/irq-sifive-plic.c
>> index 5b7bc4fd9517..f436b61d74b0 100644
>> --- a/drivers/irqchip/irq-sifive-plic.c
>> +++ b/drivers/irqchip/irq-sifive-plic.c
>> @@ -428,8 +428,11 @@ static int __init __plic_init(struct device_node
>> *node,
>> goto out_free_priv;
>> }
>> + error = of_property_read_u32(node, "riscv,ndev", &nr_irqs);
>> + if (error)
>> + goto out_iounmap;
>> +
>> error = -EINVAL;
>> - of_property_read_u32(node, "riscv,ndev", &nr_irqs);
>> if (WARN_ON(!nr_irqs))
>> goto out_iounmap;
>
So this is actually already fixed in 6.9-rc1 by this commit:
956521064780 ("irqchip/sifive-plic: Parse number of interrupts and
contexts early in plic_probe()").
Thanks,
Alex
>
> You can add:
>
> Reviewed-by: Alexandre Ghiti <alexghiti@...osinc.com>
>
> Thanks,
>
> Alex
>
>
> _______________________________________________
> linux-riscv mailing list
> linux-riscv@...ts.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-riscv
Powered by blists - more mailing lists