inbalanced ioremap/iounmap? in cpm_pic_init(); arch/powerpc/sysdev/commproc.c
It appears to me that ioremap/iounmap in cpm_pic_init() is imbalanced. I am not certain about this, nor was the patch tested. please review.
--
fix ioremap/iounmap imbalance
Signed-off-by Roel Kluin <[email protected]>
---
arch/powerpc/sysdev/commproc.c +5 -3
@@ -152,13 +152,13 @@ unsigned int cpm_pic_init(void) cpic_reg =ioremap (res.start, res.end - res.start +1 );if (cpic_reg ==NULL ) goto end; sirq =irq_of_parse_and_map (np,0 );if (sirq ==NO_IRQ ) - goto end; + goto io_out;/* Initialize the CPM interrupt controller. */ hwirq = (unsigned int )irq_map[sirq].hwirq;out_be32 (&cpic_reg->cpic_cicr, (CICR_SCD_SCC4 |CICR_SCC_SCC3 |CICR_SCB_SCC2 |CICR_SCA_SCC1 ) | ((hwirq/2 ) <<13 ) |CICR_HP_MASK );
@@ -167,13 +167,13 @@ unsigned int cpm_pic_init(void) cpm_pic_host =irq_alloc_host (of_node_get (np),IRQ_HOST_MAP_LINEAR ,64 , &cpm_pic_host_ops,64 );if (cpm_pic_host ==NULL ) {printk (KERN_ERR "CPM2 PIC: failed to allocate irq host!\n" ); sirq =NO_IRQ ; - goto end; + goto io_out; }/* Install our own error handler. */ np =of_find_compatible_node (NULL ,NULL ,"fsl,cpm1" );if (np ==NULL ) np =of_find_node_by_type (NULL ,"cpm" );
@@ -187,13 +187,15 @@ unsigned int cpm_pic_init(void) goto end;if (setup_irq (eirq, &cpm_error_irqaction))printk (KERN_ERR "Could not allocate CPM error IRQ!" );setbits32 (&cpic_reg->cpic_cicr,CICR_IEN ); - + goto end; +io_out: +iounmap (cpic_reg); end:of_node_put (np);return sirq; }void __init cpm_reset (void )
Quoted 2 lines · Roel Kluin
It appears to me that ioremap/iounmap in
cpm_pic_init()is imbalanced. I am not certain about this, nor was the patch tested. please review.
You missed several error paths... and if we're going to clean up the error handling for this function, we might as well free cpm_pic_host, and do an of_node_put() before the second of_find_compatible_node(), as well.
Quoted 5 lines
arch/powerpc/sysdev/commproc.c +0
-0@@ -187,13 +187,15 @@ unsigned int cpm_pic_init(void) goto end;if (setup_irq (eirq, &cpm_error_irqaction))printk (KERN_ERR "Could not allocate CPM error IRQ!" );
arch/powerpc/sysdev/commproc.c unsigned int cpm_pic_init(void) · line 199
Quoted 10 lines
arch/powerpc/sysdev/commproc.c +3
-1setbits32 (&cpic_reg->cpic_cicr,CICR_IEN ); - + goto end; +io_out: +iounmap (cpic_reg); end:of_node_put (np);return sirq; }
Ick. Maybe better to just duplicate the of_node_put().
-Scott