* [PATCH] qemu_fw_cfg: don't leak kobj on init error
@ 2016-04-03 12:23 Michael S. Tsirkin
2016-04-06 17:16 ` Gabriel L. Somlo
0 siblings, 1 reply; 2+ messages in thread
From: Michael S. Tsirkin @ 2016-04-03 12:23 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, Gabriel Somlo, Andreas Ziegler, Valentin Rothberg
If platform_driver_register fails, we should
cleanup fw_cfg_top_ko before exiting.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
drivers/firmware/qemu_fw_cfg.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/firmware/qemu_fw_cfg.c b/drivers/firmware/qemu_fw_cfg.c
index fedbff5..e4c4714 100644
--- a/drivers/firmware/qemu_fw_cfg.c
+++ b/drivers/firmware/qemu_fw_cfg.c
@@ -727,12 +727,18 @@ device_param_cb(mmio, &fw_cfg_cmdline_param_ops, NULL, S_IRUSR);
static int __init fw_cfg_sysfs_init(void)
{
+ int ret;
+
/* create /sys/firmware/qemu_fw_cfg/ top level directory */
fw_cfg_top_ko = kobject_create_and_add("qemu_fw_cfg", firmware_kobj);
if (!fw_cfg_top_ko)
return -ENOMEM;
- return platform_driver_register(&fw_cfg_sysfs_driver);
+ ret = platform_driver_register(&fw_cfg_sysfs_driver);
+ if (ret)
+ fw_cfg_kobj_cleanup(fw_cfg_top_ko);
+
+ return ret;
}
static void __exit fw_cfg_sysfs_exit(void)
--
MST
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] qemu_fw_cfg: don't leak kobj on init error
2016-04-03 12:23 [PATCH] qemu_fw_cfg: don't leak kobj on init error Michael S. Tsirkin
@ 2016-04-06 17:16 ` Gabriel L. Somlo
0 siblings, 0 replies; 2+ messages in thread
From: Gabriel L. Somlo @ 2016-04-06 17:16 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: linux-kernel, Greg Kroah-Hartman, Andreas Ziegler, Valentin Rothberg
On Sun, Apr 03, 2016 at 03:23:19PM +0300, Michael S. Tsirkin wrote:
> If platform_driver_register fails, we should
> cleanup fw_cfg_top_ko before exiting.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Gabriel Somlo <somlo@cmu.edu>
Thanks,
--Gabriel
> ---
> drivers/firmware/qemu_fw_cfg.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/qemu_fw_cfg.c b/drivers/firmware/qemu_fw_cfg.c
> index fedbff5..e4c4714 100644
> --- a/drivers/firmware/qemu_fw_cfg.c
> +++ b/drivers/firmware/qemu_fw_cfg.c
> @@ -727,12 +727,18 @@ device_param_cb(mmio, &fw_cfg_cmdline_param_ops, NULL, S_IRUSR);
>
> static int __init fw_cfg_sysfs_init(void)
> {
> + int ret;
> +
> /* create /sys/firmware/qemu_fw_cfg/ top level directory */
> fw_cfg_top_ko = kobject_create_and_add("qemu_fw_cfg", firmware_kobj);
> if (!fw_cfg_top_ko)
> return -ENOMEM;
>
> - return platform_driver_register(&fw_cfg_sysfs_driver);
> + ret = platform_driver_register(&fw_cfg_sysfs_driver);
> + if (ret)
> + fw_cfg_kobj_cleanup(fw_cfg_top_ko);
> +
> + return ret;
> }
>
> static void __exit fw_cfg_sysfs_exit(void)
> --
> MST
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-04-06 17:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-04-03 12:23 [PATCH] qemu_fw_cfg: don't leak kobj on init error Michael S. Tsirkin
2016-04-06 17:16 ` Gabriel L. Somlo
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).