diff mbox series

[next] libata: ensure host is free'd on error exit paths

Message ID 20180327132601.12749-1-colin.king@canonical.com
State Not Applicable
Delegated to: David Miller
Headers show
Series [next] libata: ensure host is free'd on error exit paths | expand

Commit Message

Colin Ian King March 27, 2018, 1:26 p.m. UTC 
From: Colin Ian King <colin.king@canonical.com>

The host structure is not being kfree'd on two error exit paths
leading to memory leaks. Add in new err_free label and kfree host.

Detected by CoverityScan, CID#1466103 ("Resource leak")

Fixes: 2623c7a5f279 ("libata: add refcounting to ata_host")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 drivers/ata/libata-core.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Tejun Heo March 27, 2018, 1:57 p.m. UTC | #1 
On Tue, Mar 27, 2018 at 02:26:01PM +0100, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> The host structure is not being kfree'd on two error exit paths
> leading to memory leaks. Add in new err_free label and kfree host.
> 
> Detected by CoverityScan, CID#1466103 ("Resource leak")
> 
> Fixes: 2623c7a5f279 ("libata: add refcounting to ata_host")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>

Applied to libata/for-4.17.

Thanks.
diff mbox series

Patch

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index dc2c48b8ae45..8bc71ca61e7f 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -6108,7 +6108,7 @@  struct ata_host *ata_host_alloc(struct device *dev, int max_ports)
 		return NULL;
 
 	if (!devres_open_group(dev, NULL, GFP_KERNEL))
-		return NULL;
+		goto err_free;
 
 	dr = devres_alloc(ata_devres_release, 0, GFP_KERNEL);
 	if (!dr)
@@ -6140,6 +6140,8 @@  struct ata_host *ata_host_alloc(struct device *dev, int max_ports)
 
  err_out:
 	devres_release_group(dev, NULL);
+ err_free:
+	kfree(host);
 	return NULL;
 }