renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-15 16:53:54 +08:00
Code

firmware: stratix10-svc: Fix a resource leak in an error handling path

Browse Source 
If an error occurs after a successful 'kfifo_alloc()' call, it must be
undone by a corresponding 'kfifo_free()' call, as already done in the
remove function.

While at it, move the 'platform_device_put()' call to this new error
handling path and explicitly return 0 in the success path.

Fixes: b5dc75c915 ("firmware: stratix10-svc: extend svc to support new RSU features")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/0ca3f3ab139c53e846804455a1e7599ee8ae896a.1621621271.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Christophe JAILLET 2021-05-21 20:22:15 +02:00 committed by Greg Kroah-Hartman
parent 5fe3cba0bf
commit d99247f9b5
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/firmware/stratix10-svc.c
View File

@ -1034,24 +1034,32 @@ static int stratix10_svc_drv_probe(struct platform_device *pdev)
/* add svc client device(s) */ /* add svc client device(s) */
svc = devm_kzalloc(dev, sizeof(*svc), GFP_KERNEL); svc = devm_kzalloc(dev, sizeof(*svc), GFP_KERNEL);
if (!svc) if (!svc) {
return -ENOMEM; ret = -ENOMEM;
goto err_free_kfifo;
}
svc->stratix10_svc_rsu = platform_device_alloc(STRATIX10_RSU, 0); svc->stratix10_svc_rsu = platform_device_alloc(STRATIX10_RSU, 0);
if (!svc->stratix10_svc_rsu) { if (!svc->stratix10_svc_rsu) {
dev_err(dev, "failed to allocate %s device\n", STRATIX10_RSU); dev_err(dev, "failed to allocate %s device\n", STRATIX10_RSU);
return -ENOMEM; ret = -ENOMEM;
goto err_free_kfifo;
} }
ret = platform_device_add(svc->stratix10_svc_rsu); ret = platform_device_add(svc->stratix10_svc_rsu);
if (ret) { if (ret)
platform_device_put(svc->stratix10_svc_rsu); goto err_put_device;
return ret;
}
dev_set_drvdata(dev, svc); dev_set_drvdata(dev, svc);
pr_info("Intel Service Layer Driver Initialized\n"); pr_info("Intel Service Layer Driver Initialized\n");
return 0;
err_put_device:
platform_device_put(svc->stratix10_svc_rsu);
err_free_kfifo:
kfifo_free(&controller->svc_fifo);
return ret; return ret;
} }