Skip to contentSkip to conversation

clk:at91: Fix memory leak in of_at91_clk_master_setup()

PATCH In review Masanari Iida 4 participants 6 messages Feb 11, 2014 – Feb 27, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 clk:at91: Fix memory leak in of_at91_clk_master_setup()

cppcheck detected following error [clk-master.c:245]: (error) Memory leak: characteristics

The original code forgot to free characteristics when irq_of_parse_and_map() failed.

---
 drivers/clk/at91/clk-master.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/at91/clk-master.c +1 -1
index bd313f7..c1af80b 100644
@@ -242,7 +242,7 @@ of_at91_clk_master_setup(struct device_node *np, struct at91_pmc *pmc,
 
 	irq = irq_of_parse_and_map(np, 0);
 	if (!irq)
-		return;
+		goto out_free_characteristics;
 
 	clk = at91_clk_register_master(pmc, irq, name, num_parents,
 				       parent_names, layout,
Signature · 1 line
1.9.rc1
#1 lore raw
Quoted 7 lines · Masanari Iida

cppcheck detected following error [clk-master.c:245]: (error) Memory leak: characteristics

The original code forgot to free characteristics when irq_of_parse_and_map() failed.

Acked-by Boris BREZILLON <[email protected]>

Thanks for fixing this.

Best Regards,

Boris

Quoted 17 lines
---
  drivers/clk/at91/clk-master.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/at91/clk-master.c +1 -1
index bd313f7..c1af80b 100644
@@ -242,7 +242,7 @@ of_at91_clk_master_setup(struct device_node *np, struct at91_pmc *pmc,
 
  	irq = irq_of_parse_and_map(np, 0);
  	if (!irq)
-		return;
+		goto out_free_characteristics;
 
  	clk = at91_clk_register_master(pmc, irq, name, num_parents,
  				       parent_names, layout,
#2 lore raw

Hi Mike,

Could you take this patch for the next 3.14 release ?

Best Regards,

Boris

Quoted 33 lines · Boris BREZILLON
Quoted 7 lines · Masanari Iida

cppcheck detected following error [clk-master.c:245]: (error) Memory leak: characteristics

The original code forgot to free characteristics when irq_of_parse_and_map() failed.

Acked-by Boris BREZILLON <[email protected]>

Thanks for fixing this.

Best Regards,

Boris

Quoted 17 lines
---
  drivers/clk/at91/clk-master.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/at91/clk-master.c +1 -1
index bd313f7..c1af80b 100644
@@ -242,7 +242,7 @@ of_at91_clk_master_setup(struct device_node *np, 
 struct at91_pmc *pmc,
        irq = irq_of_parse_and_map(np, 0);
      if (!irq)
-        return;
+        goto out_free_characteristics;
        clk = at91_clk_register_master(pmc, irq, name, num_parents,
                         parent_names, layout,
#3 lore raw

Quoting Boris BREZILLON (2014-02-15 09:08:12)

Quoted 3 lines

Hi Mike,

Could you take this patch for the next 3.14 release ?

Taken in for the next batch of fixes.

Regards,
Mike

Quoted 40 lines

Best Regards,

Boris

Quoted 33 lines · Boris BREZILLON
Quoted 7 lines · Masanari Iida

cppcheck detected following error [clk-master.c:245]: (error) Memory leak: characteristics

The original code forgot to free characteristics when irq_of_parse_and_map() failed.

Acked-by Boris BREZILLON <[email protected]>

Thanks for fixing this.

Best Regards,

Boris

Quoted 17 lines
---
  drivers/clk/at91/clk-master.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/at91/clk-master.c +1 -1
index bd313f7..c1af80b 100644
@@ -242,7 +242,7 @@ of_at91_clk_master_setup(struct device_node *np, 
 struct at91_pmc *pmc,
        irq = irq_of_parse_and_map(np, 0);
      if (!irq)
-        return;
+        goto out_free_characteristics;
        clk = at91_clk_register_master(pmc, irq, name, num_parents,
                         parent_names, layout,
#4 lore raw
Quoted 5 lines · Mike Turquette

Quoting Boris BREZILLON (2014-02-15 09:08:12)

Quoted 3 lines

Hi Mike,

Could you take this patch for the next 3.14 release ?

Taken in for the next batch of fixes.

Thanks.

Quoted 41 lines

Regards,
Mike

Quoted 37 lines

Best Regards,

Boris

Quoted 32 lines · Boris BREZILLON
Quoted 7 lines · Masanari Iida

cppcheck detected following error [clk-master.c:245]: (error) Memory leak: characteristics

The original code forgot to free characteristics when irq_of_parse_and_map() failed.

Acked-by Boris BREZILLON <[email protected]>

Thanks for fixing this.

Best Regards,

Boris

Quoted 17 lines
---
   drivers/clk/at91/clk-master.c | 2 +-
   1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/at91/clk-master.c +1 -1
index bd313f7..c1af80b 100644
@@ -242,7 +242,7 @@ of_at91_clk_master_setup(struct device_node *np,
 struct at91_pmc *pmc,
         irq = irq_of_parse_and_map(np, 0);
       if (!irq)
-        return;
+        goto out_free_characteristics;
         clk = at91_clk_register_master(pmc, irq, name, num_parents,
                          parent_names, layout,
Acked-by on v1 1/1
#5 lore raw
In reply to Masanari Iida
Quoted 7 lines · Masanari Iida

cppcheck detected following error [clk-master.c:245]: (error) Memory leak: characteristics

The original code forgot to free characteristics when irq_of_parse_and_map() failed.

Quoted 25 lines
---
 drivers/clk/at91/clk-master.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/at91/clk-master.c +1 -1
index bd313f7..c1af80b 100644
@@ -242,7 +242,7 @@ of_at91_clk_master_setup(struct device_node *np, struct at91_pmc *pmc,
 
 	irq = irq_of_parse_and_map(np, 0);
 	if (!irq)
-		return;
+		goto out_free_characteristics;
 
 	clk = at91_clk_register_master(pmc, irq, name, num_parents,
 				       parent_names, layout,
Signature · 7 lines
1.9.rc1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Signature · 3 lines
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com