* [PATCH -next 1/3] firmware: stratix10-svc: add missing gen_pool_destroy() in stratix10_svc_drv_probe()
@ 2022-07-19 14:02 Yang Yingliang
2022-07-19 14:02 ` [PATCH -next 2/3] firmware: stratix10-svc: fix memory leak when platform_device_alloc/add() fails Yang Yingliang
2022-07-19 14:02 ` [PATCH -next 3/3] firmware: stratix10-svc: add missing platform_device_unregister() Yang Yingliang
0 siblings, 2 replies; 3+ messages in thread
From: Yang Yingliang @ 2022-07-19 14:02 UTC (permalink / raw)
To: linux-kernel; +Cc: dinguyen
In error path in stratix10_svc_drv_probe(), gen_pool_destroy() should be called
to destroy the memory pool that created by svc_create_memory_pool().
Fixes: 7ca5ce896524 ("firmware: add Intel Stratix10 service layer driver")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
drivers/firmware/stratix10-svc.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/drivers/firmware/stratix10-svc.c b/drivers/firmware/stratix10-svc.c
index b4081f4d88a3..1a5640b3ab42 100644
--- a/drivers/firmware/stratix10-svc.c
+++ b/drivers/firmware/stratix10-svc.c
@@ -1138,13 +1138,17 @@ static int stratix10_svc_drv_probe(struct platform_device *pdev)
/* allocate service controller and supporting channel */
controller = devm_kzalloc(dev, sizeof(*controller), GFP_KERNEL);
- if (!controller)
- return -ENOMEM;
+ if (!controller) {
+ ret = -ENOMEM;
+ goto err_destroy_pool;
+ }
chans = devm_kmalloc_array(dev, SVC_NUM_CHANNEL,
sizeof(*chans), GFP_KERNEL | __GFP_ZERO);
- if (!chans)
- return -ENOMEM;
+ if (!chans) {
+ ret = -ENOMEM;
+ goto err_destroy_pool;
+ }
controller->dev = dev;
controller->num_chans = SVC_NUM_CHANNEL;
@@ -1159,7 +1163,7 @@ static int stratix10_svc_drv_probe(struct platform_device *pdev)
ret = kfifo_alloc(&controller->svc_fifo, fifo_size, GFP_KERNEL);
if (ret) {
dev_err(dev, "failed to allocate FIFO\n");
- return ret;
+ goto err_destroy_pool;
}
spin_lock_init(&controller->svc_fifo_lock);
@@ -1221,6 +1225,8 @@ static int stratix10_svc_drv_probe(struct platform_device *pdev)
err_free_kfifo:
kfifo_free(&controller->svc_fifo);
+err_destroy_pool:
+ gen_pool_destroy(genpool);
return ret;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH -next 2/3] firmware: stratix10-svc: fix memory leak when platform_device_alloc/add() fails
2022-07-19 14:02 [PATCH -next 1/3] firmware: stratix10-svc: add missing gen_pool_destroy() in stratix10_svc_drv_probe() Yang Yingliang
@ 2022-07-19 14:02 ` Yang Yingliang
2022-07-19 14:02 ` [PATCH -next 3/3] firmware: stratix10-svc: add missing platform_device_unregister() Yang Yingliang
1 sibling, 0 replies; 3+ messages in thread
From: Yang Yingliang @ 2022-07-19 14:02 UTC (permalink / raw)
To: linux-kernel; +Cc: dinguyen
If platform_device_alloc/add() failed in stratix10_svc_drv_probe(),
'svc_fifo' and 'genpool' should be freed.
Fixes: e6281c26674e ("firmware: stratix10-svc: Add support for FCS")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
drivers/firmware/stratix10-svc.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/firmware/stratix10-svc.c b/drivers/firmware/stratix10-svc.c
index 1a5640b3ab42..cb824f63faa8 100644
--- a/drivers/firmware/stratix10-svc.c
+++ b/drivers/firmware/stratix10-svc.c
@@ -1202,19 +1202,20 @@ static int stratix10_svc_drv_probe(struct platform_device *pdev)
ret = platform_device_add(svc->stratix10_svc_rsu);
if (ret) {
platform_device_put(svc->stratix10_svc_rsu);
- return ret;
+ goto err_free_kfifo;
}
svc->intel_svc_fcs = platform_device_alloc(INTEL_FCS, 1);
if (!svc->intel_svc_fcs) {
dev_err(dev, "failed to allocate %s device\n", INTEL_FCS);
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto err_free_kfifo;
}
ret = platform_device_add(svc->intel_svc_fcs);
if (ret) {
platform_device_put(svc->intel_svc_fcs);
- return ret;
+ goto err_free_kfifo;
}
dev_set_drvdata(dev, svc);
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH -next 3/3] firmware: stratix10-svc: add missing platform_device_unregister()
2022-07-19 14:02 [PATCH -next 1/3] firmware: stratix10-svc: add missing gen_pool_destroy() in stratix10_svc_drv_probe() Yang Yingliang
2022-07-19 14:02 ` [PATCH -next 2/3] firmware: stratix10-svc: fix memory leak when platform_device_alloc/add() fails Yang Yingliang
@ 2022-07-19 14:02 ` Yang Yingliang
1 sibling, 0 replies; 3+ messages in thread
From: Yang Yingliang @ 2022-07-19 14:02 UTC (permalink / raw)
To: linux-kernel; +Cc: dinguyen
Add missing platform_device_unregister() in error path in
stratix10_svc_drv_probe().
Fixes: e6281c26674e ("firmware: stratix10-svc: Add support for FCS")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
drivers/firmware/stratix10-svc.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/firmware/stratix10-svc.c b/drivers/firmware/stratix10-svc.c
index cb824f63faa8..bde1f543f529 100644
--- a/drivers/firmware/stratix10-svc.c
+++ b/drivers/firmware/stratix10-svc.c
@@ -1209,13 +1209,13 @@ static int stratix10_svc_drv_probe(struct platform_device *pdev)
if (!svc->intel_svc_fcs) {
dev_err(dev, "failed to allocate %s device\n", INTEL_FCS);
ret = -ENOMEM;
- goto err_free_kfifo;
+ goto err_unregister_dev;
}
ret = platform_device_add(svc->intel_svc_fcs);
if (ret) {
platform_device_put(svc->intel_svc_fcs);
- goto err_free_kfifo;
+ goto err_unregister_dev;
}
dev_set_drvdata(dev, svc);
@@ -1224,6 +1224,8 @@ static int stratix10_svc_drv_probe(struct platform_device *pdev)
return 0;
+err_unregister_dev:
+ platform_device_unregister(svc->stratix10_svc_rsu);
err_free_kfifo:
kfifo_free(&controller->svc_fifo);
err_destroy_pool:
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-07-19 14:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-19 14:02 [PATCH -next 1/3] firmware: stratix10-svc: add missing gen_pool_destroy() in stratix10_svc_drv_probe() Yang Yingliang
2022-07-19 14:02 ` [PATCH -next 2/3] firmware: stratix10-svc: fix memory leak when platform_device_alloc/add() fails Yang Yingliang
2022-07-19 14:02 ` [PATCH -next 3/3] firmware: stratix10-svc: add missing platform_device_unregister() Yang Yingliang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).