Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1370211 > unrolled thread

[PATCH] qemu_fw_cfg: don't leak kobj on init error

Back to article view | Back to linux.kernel

Contents

  [PATCH] qemu_fw_cfg: don't leak kobj on init error "Michael S. Tsirkin" <mst@redhat.com> - 2016-04-03 14:30 +0200
    Re: [PATCH] qemu_fw_cfg: don't leak kobj on init error "Gabriel L. Somlo" <somlo@cmu.edu> - 2016-04-06 19:20 +0200

#1370211 — [PATCH] qemu_fw_cfg: don't leak kobj on init error

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

[toc] | [next] | [standalone]

#1372676

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

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web