public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH][next] libata: ensure host is free'd on error exit paths
@ 2018-03-27 13:26 Colin King
  2018-03-27 13:57 ` Tejun Heo
  0 siblings, 1 reply; 2+ messages in thread
From: Colin King @ 2018-03-27 13:26 UTC (permalink / raw)
  To: Tejun Heo, linux-ide; +Cc: kernel-janitors, linux-kernel

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(-)

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;
 }
 
-- 
2.15.1

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH][next] libata: ensure host is free'd on error exit paths
  2018-03-27 13:26 [PATCH][next] libata: ensure host is free'd on error exit paths Colin King
@ 2018-03-27 13:57 ` Tejun Heo
  0 siblings, 0 replies; 2+ messages in thread
From: Tejun Heo @ 2018-03-27 13:57 UTC (permalink / raw)
  To: Colin King; +Cc: linux-ide, kernel-janitors, linux-kernel

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.

-- 
tejun

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-03-27 13:57 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-27 13:26 [PATCH][next] libata: ensure host is free'd on error exit paths Colin King
2018-03-27 13:57 ` Tejun Heo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox