2024-03-21 11:05:10

by Guanrui Huang

Subject: [PATCH] irqchip/gic-v3-its: Fix double free on error

In its_vpe_irq_domain_alloc, when its_vpe_init() returns an error
with i > 0, its_vpe_irq_domain_free may free bitmap and vprop_page,
and then there is a double free in its_vpe_irq_domain_alloc.

Fix it by checking if bitmap is empty in its_vpe_irq_domain_alloc.
If bitmap is empty and i > 0, means that bitmap have been clear and free
in its_vpe_irq_domain_free.

Signed-off-by: Guanrui Huang <[email protected]>
---
drivers/irqchip/irq-gic-v3-its.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c
index fca888b36680..98a1be90caef 100644
--- a/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@ -4562,9 +4562,14 @@ static int its_vpe_irq_domain_alloc(struct irq_domain *domain, unsigned int virq
}

if (err) {
- if (i > 0)
+ if (i > 0) {
its_vpe_irq_domain_free(domain, virq, i);

+ /* bitmap and vprop_page be freed in its_vpe_irq_domain_free */
+ if (bitmap_empty(bitmap, nr_ids))
+ return err;
+ }
+
its_lpi_free(bitmap, base, nr_ids);
its_free_prop_table(vprop_page);
}
--
2.36.1

2024-03-21 12:43:49

by Zenghui Yu

Subject: Re: [PATCH] irqchip/gic-v3-its: Fix double free on error

On 2024/3/21 19:04, Guanrui Huang wrote:
> In its_vpe_irq_domain_alloc, when its_vpe_init() returns an error
> with i > 0, its_vpe_irq_domain_free may free bitmap and vprop_page,
> and then there is a double free in its_vpe_irq_domain_alloc.
>
> Fix it by checking if bitmap is empty in its_vpe_irq_domain_alloc.
> If bitmap is empty and i > 0, means that bitmap have been clear and free
> in its_vpe_irq_domain_free.
>
> Signed-off-by: Guanrui Huang <[email protected]>
> ---
> drivers/irqchip/irq-gic-v3-its.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c
> index fca888b36680..98a1be90caef 100644
> --- a/drivers/irqchip/irq-gic-v3-its.c
> +++ b/drivers/irqchip/irq-gic-v3-its.c
> @@ -4562,9 +4562,14 @@ static int its_vpe_irq_domain_alloc(struct irq_domain *domain, unsigned int virq
> }
>
> if (err) {
> - if (i > 0)
> + if (i > 0) {
> its_vpe_irq_domain_free(domain, virq, i);
>
> + /* bitmap and vprop_page be freed in its_vpe_irq_domain_free */
> + if (bitmap_empty(bitmap, nr_ids))

It looks like that 'bitmap' can't be non-empty if you managed to get
here. Right?

> + return err;
> + }
> +
> its_lpi_free(bitmap, base, nr_ids);
> its_free_prop_table(vprop_page);
> }

Is it possible that we handle these 2 cases together? I.e., does the
following approach help?

if (err)
its_vpe_irq_domain_free(domain, virq, i);

Thanks,
Zenghui

2024-03-22 02:38:32

by huangguanrui.hgr

Subject: Re: [PATCH] irqchip/gic-v3-its: Fix double free on error

We notice that:
In its_vpe_irq_domain_alloc, its_vm is from args, But in its_vpe_irq_domain_free,
its_vm is from domain->host_data.

Will these two values be different? For example, when other bugs occur?
If these two values is different, I think we can't handle these 2 cases together.

if (err)
its_vpe_irq_domain_free(domain, virq, i);
Because these will lead a memleak.

So I think that check the bitmap is a safe way to fix this. If bitmap is empty, that means
its_vpe_irq_domain_free handles same its_vm which comes from its_vpe_irq_domain_alloc.

Thanks,
Guanrui

2024-03-26 09:47:29

by Zenghui Yu

Subject: Re: [PATCH] irqchip/gic-v3-its: Fix double free on error

On 2024/3/22 10:38, huangguanrui.hgr wrote:
> We notice that:
> In its_vpe_irq_domain_alloc, its_vm is from args, But in its_vpe_irq_domain_free,
> its_vm is from domain->host_data.

They *should* point to the same its_vm structure.

> Will these two values be different? For example, when other bugs occur?

Of course they can be different if there are *bugs* but I guess you
won't get any further (e.g., you hit BUG_ON(vm != vpe->its_vm) in
its_vpe_irq_domain_free()). The right thing to do is fixing the bug
rather than papering over it.

Zenghui