s390/dasd: Fix potential memleak in dasd_eckd_init()

[PATCH] s390/dasd: Fix potential memleak in dasd_eckd_init()

Posted by Qiheng Lin 3 years, 4 months ago

`dasd_reserve_req` is allocated before `dasd_vol_info_req`, and it
also needs to be freed before the error returns, just like the other
cases in this function.

Fixes: 9e12e54c7a8f ("s390/dasd: Handle out-of-space constraint")
Signed-off-by: Qiheng Lin <linqiheng@huawei.com>
---
 drivers/s390/block/dasd_eckd.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index 5d0b9991e91a..b20ce86b97b2 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -6956,8 +6956,10 @@ dasd_eckd_init(void)
 		return -ENOMEM;
 	dasd_vol_info_req = kmalloc(sizeof(*dasd_vol_info_req),
 				    GFP_KERNEL | GFP_DMA);
-	if (!dasd_vol_info_req)
+	if (!dasd_vol_info_req) {
+		kfree(dasd_reserve_req);
 		return -ENOMEM;
+	}
 	pe_handler_worker = kmalloc(sizeof(*pe_handler_worker),
 				    GFP_KERNEL | GFP_DMA);
 	if (!pe_handler_worker) {
-- 
2.32.0

Re: [PATCH] s390/dasd: Fix potential memleak in dasd_eckd_init()

Posted by Stefan Haberland 3 years, 4 months ago

Am 08.12.22 um 14:38 schrieb Qiheng Lin:
> `dasd_reserve_req` is allocated before `dasd_vol_info_req`, and it
> also needs to be freed before the error returns, just like the other
> cases in this function.
>
> Fixes: 9e12e54c7a8f ("s390/dasd: Handle out-of-space constraint")
> Signed-off-by: Qiheng Lin <linqiheng@huawei.com>
> ---
>

Thanks, applied.