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

[Zenghui Yu]

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 <guanrui.huang@xxxxxxxxxxxxxxxxx>
> ---
>  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