[PATCH] dmi-id: fix a memory leak in dmi_id_init error path

[PATCH] dmi-id: fix a memory leak in dmi_id_init error path

[Axel Lin]

This patch adds a missing kfree(dmi_dev) in dmi_id_init error path.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
 drivers/firmware/dmi-id.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
index a777a35..94a58a0 100644
--- a/drivers/firmware/dmi-id.c
+++ b/drivers/firmware/dmi-id.c
@@ -229,10 +229,12 @@ static int __init dmi_id_init(void)
 
 	ret = device_register(dmi_dev);
 	if (ret)
-		goto fail_class_unregister;
+		goto fail_free_dmi_dev;
 
 	return 0;
 
+fail_free_dmi_dev:
+	kfree(dmi_dev);
 fail_class_unregister:
 
 	class_unregister(&dmi_class);
-- 
1.5.4.3

Re: [PATCH] dmi-id: fix a memory leak in dmi_id_init error path

[Tejun Heo]

Hello,

On 07/01/2010 04:35 AM, Axel Lin wrote:
> This patch adds a missing kfree(dmi_dev) in dmi_id_init error path.
> 
> Signed-off-by: Axel Lin <axel.lin@gmail.com>

Acked-by: Tejun Heo <tj@kernel.org>

Greg, can you please route this through device tree?

Thanks.

-- 
tejun

Re: [PATCH] dmi-id: fix a memory leak in dmi_id_init error path

[Greg KH]

On Fri, Jul 02, 2010 at 09:05:17AM +0200, Tejun Heo wrote:
> Hello,
> 
> On 07/01/2010 04:35 AM, Axel Lin wrote:
> > This patch adds a missing kfree(dmi_dev) in dmi_id_init error path.
> > 
> > Signed-off-by: Axel Lin <axel.lin@gmail.com>
> 
> Acked-by: Tejun Heo <tj@kernel.org>
> 
> Greg, can you please route this through device tree?

I will do that, thanks.

greg k-h

patch "dmi-id: fix a memory leak in dmi_id_init error path" added to gregkh-2.6 tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    dmi-id: fix a memory leak in dmi_id_init error path

to my gregkh-2.6 tree which can be found in directory form at:
    http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/
 and in git form at:
    git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/patches.git

The filename of this patch is:
    dmi-id-fix-a-memory-leak-in-dmi_id_init-error-path.patch

The patch will show up in the next release of the linux-next tree
(usually sometime within the next 24 hours during the week.)

If this patch meets the merge guidelines for a bugfix, it should be
merged into Linus's tree before the next major kernel release.
If not, it will be merged into Linus's tree during the next merge window.

Either way, you will probably be copied on the patch when it gets sent
to Linus for merging so that others can see what is happening in kernel
development.

If you have any questions about this process, please let me know.


>From axel.lin@gmail.com  Thu Jul  8 08:56:03 2010
From: Axel Lin <axel.lin@gmail.com>
Date: Thu, 01 Jul 2010 10:35:07 +0800
Subject: dmi-id: fix a memory leak in dmi_id_init error path
To: linux-kernel <linux-kernel@vger.kernel.org>
Cc: Tejun Heo <tj@kernel.org>, David Brownell <dbrownell@users.sourceforge.net>, Greg Kroah-Hartman <gregkh@suse.de>
Message-ID: <1277951707.30073.5.camel@mola>


This patch adds a missing kfree(dmi_dev) in dmi_id_init error path.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 drivers/firmware/dmi-id.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- a/drivers/firmware/dmi-id.c
+++ b/drivers/firmware/dmi-id.c
@@ -229,10 +229,12 @@ static int __init dmi_id_init(void)
 
 	ret = device_register(dmi_dev);
 	if (ret)
-		goto fail_class_unregister;
+		goto fail_free_dmi_dev;
 
 	return 0;
 
+fail_free_dmi_dev:
+	kfree(dmi_dev);
 fail_class_unregister:
 
 	class_unregister(&dmi_class);