| Message ID | 20240327142334.1098-1-yuzenghui@huawei.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | irqchip/loongson-pch-msi: Fix off-by-one on allocation error path | expand |
在 2024/3/27 14:23, Zenghui Yu 写道: > When pch_msi_parent_domain_alloc() returns an error, there is an off-by-one > in the number of IRQs to be freed. > > Fix it by passing the number of successfully allocated IRQs, instead of the > relative index of the last allocated one. > > Fixes: 632dcc2c75ef ("irqchip: Add Loongson PCH MSI controller") > Cc: Huacai Chen <chenhuacai@kernel.org> > Cc: Jiaxun Yang <jiaxun.yang@flygoat.com> > Signed-off-by: Zenghui Yu <yuzenghui@huawei.com> Reviewed-by: Jiaxun Yang <jiaxun.yang@flygoat.com> I copied that piece of code from another driver without thinking. Good catch! > --- > drivers/irqchip/irq-loongson-pch-msi.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/irqchip/irq-loongson-pch-msi.c b/drivers/irqchip/irq-loongson-pch-msi.c > index 6e1e1f011bb2..dd4d699170f4 100644 > --- a/drivers/irqchip/irq-loongson-pch-msi.c > +++ b/drivers/irqchip/irq-loongson-pch-msi.c > @@ -136,7 +136,7 @@ static int pch_msi_middle_domain_alloc(struct irq_domain *domain, > > err_hwirq: > pch_msi_free_hwirq(priv, hwirq, nr_irqs); > - irq_domain_free_irqs_parent(domain, virq, i - 1); > + irq_domain_free_irqs_parent(domain, virq, i); > > return err; > }
diff --git a/drivers/irqchip/irq-loongson-pch-msi.c b/drivers/irqchip/irq-loongson-pch-msi.c index 6e1e1f011bb2..dd4d699170f4 100644 --- a/drivers/irqchip/irq-loongson-pch-msi.c +++ b/drivers/irqchip/irq-loongson-pch-msi.c @@ -136,7 +136,7 @@ static int pch_msi_middle_domain_alloc(struct irq_domain *domain, err_hwirq: pch_msi_free_hwirq(priv, hwirq, nr_irqs); - irq_domain_free_irqs_parent(domain, virq, i - 1); + irq_domain_free_irqs_parent(domain, virq, i); return err; }
When pch_msi_parent_domain_alloc() returns an error, there is an off-by-one in the number of IRQs to be freed. Fix it by passing the number of successfully allocated IRQs, instead of the relative index of the last allocated one. Fixes: 632dcc2c75ef ("irqchip: Add Loongson PCH MSI controller") Cc: Huacai Chen <chenhuacai@kernel.org> Cc: Jiaxun Yang <jiaxun.yang@flygoat.com> Signed-off-by: Zenghui Yu <yuzenghui@huawei.com> --- drivers/irqchip/irq-loongson-pch-msi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)