summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/spi-nor/aspeed-smc.c
diff options
context:
space:
mode:
authorNishka Dasgupta <nishkadg.linux@gmail.com>2019-08-08 13:21:04 +0530
committerTudor Ambarus <tudor.ambarus@microchip.com>2019-08-28 12:40:31 +0300
commit6597f0b0516ab078b9ed2df4dd9aea17275995cd (patch)
tree440bba5caf913f9943451dcd5078e12812544ccc /drivers/mtd/spi-nor/aspeed-smc.c
parent620df2497415a932abd0d9f59688af79f60de8bf (diff)
downloadblackbird-op-linux-6597f0b0516ab078b9ed2df4dd9aea17275995cd.tar.gz
blackbird-op-linux-6597f0b0516ab078b9ed2df4dd9aea17275995cd.zip
mtd: spi-nor: aspeed-smc: Add of_node_put()
Each iteration of for_each_available_child_of_node puts the previous node, but in the case of a break from the middle of the loop, there is no put, thus causing a memory leak. Upon termination of the loop (whether by break or a natural exit), either ret will have a non-zero value or child will be NULL. Hence add an of_node_put() that will execute only when ret has a non-zero value, as calling of_node_put() on a possible NULL value does not cause any further issues. Issue found with Coccinelle. Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com> Reviewed-by: Andrew Jeffery <andrew@aj.id.au> Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Diffstat (limited to 'drivers/mtd/spi-nor/aspeed-smc.c')
-rw-r--r--drivers/mtd/spi-nor/aspeed-smc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mtd/spi-nor/aspeed-smc.c b/drivers/mtd/spi-nor/aspeed-smc.c
index 19b8757325d2..009c1da8574c 100644
--- a/drivers/mtd/spi-nor/aspeed-smc.c
+++ b/drivers/mtd/spi-nor/aspeed-smc.c
@@ -836,8 +836,10 @@ static int aspeed_smc_setup_flash(struct aspeed_smc_controller *controller,
controller->chips[cs] = chip;
}
- if (ret)
+ if (ret) {
+ of_node_put(child);
aspeed_smc_unregister(controller);
+ }
return ret;
}
OpenPOWER on IntegriCloud