lkml.org 
[lkml]   [2020]   [Jun]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 06/14] irqchip/digicolor: Fix potential resource leaks
    Date
    In the function digicolor_of_init(), system resources "reg_base" and
    "digicolor_irq_domain" were not released in a few error cases. Thus
    add jump targets for the completion of the desired exception handling.

    Fixes: 8041dfbd31cf ("irqchip: Conexant CX92755 interrupts controller driver")
    Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
    ---
    drivers/irqchip/irq-digicolor.c | 14 +++++++++++---
    1 file changed, 11 insertions(+), 3 deletions(-)

    diff --git a/drivers/irqchip/irq-digicolor.c b/drivers/irqchip/irq-digicolor.c
    index fc38d2d..18c6e77 100644
    --- a/drivers/irqchip/irq-digicolor.c
    +++ b/drivers/irqchip/irq-digicolor.c
    @@ -89,7 +89,8 @@ static int __init digicolor_of_init(struct device_node *node,
    ucregs = syscon_regmap_lookup_by_phandle(node, "syscon");
    if (IS_ERR(ucregs)) {
    pr_err("%pOF: unable to map UC registers\n", node);
    - return PTR_ERR(ucregs);
    + ret = PTR_ERR(ucregs);
    + goto err_iounmap;
    }
    /* channel 1, regular IRQs */
    regmap_write(ucregs, UC_IRQ_CONTROL, 1);
    @@ -98,7 +99,8 @@ static int __init digicolor_of_init(struct device_node *node,
    irq_domain_add_linear(node, 64, &irq_generic_chip_ops, NULL);
    if (!digicolor_irq_domain) {
    pr_err("%pOF: unable to create IRQ domain\n", node);
    - return -ENOMEM;
    + ret = -ENOMEM;
    + goto err_iounmap;
    }

    ret = irq_alloc_domain_generic_chips(digicolor_irq_domain, 32, 1,
    @@ -106,7 +108,7 @@ static int __init digicolor_of_init(struct device_node *node,
    clr, 0, 0);
    if (ret) {
    pr_err("%pOF: unable to allocate IRQ gc\n", node);
    - return ret;
    + goto err_domain_remove;
    }

    digicolor_set_gc(reg_base, 0, IC_INT0ENABLE_LO, IC_FLAG_CLEAR_LO);
    @@ -115,5 +117,11 @@ static int __init digicolor_of_init(struct device_node *node,
    set_handle_irq(digicolor_handle_irq);

    return 0;
    +
    +err_domain_remove:
    + irq_domain_remove(digicolor_irq_domain);
    +err_iounmap:
    + iounmap(reg_base);
    + return ret;
    }
    IRQCHIP_DECLARE(conexant_digicolor_ic, "cnxt,cx92755-ic", digicolor_of_init);
    --
    2.1.0
    \
     
     \ /
      Last update: 2020-07-01 04:17    [W:4.029 / U:0.256 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site