[PATCH] efi: fix always unregister kset of efivars in register_efivars

[PATCH] efi: fix always unregister kset of efivars in register_efivars

[Lee, Chun-Yi]

The cc9c97b76aa7235d5a1de0f74f990097f77008b4 patch introduced a
issue that always unregister kset of efivars in register_efivars.

This patch moved the kset_unregister function call to the kobject create check
block for fix issue.

Cc: Matthew Garrett <mjg-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Cc: H. Peter Anvin <hpa-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org>
Cc: Jeremy Kerr <jeremy.kerr-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
Cc: Matt Fleming <matt.fleming-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Signed-off-by: Lee, Chun-Yi <jlee-IBi9RG/b67k@public.gmane.org>
---
 drivers/firmware/efivars.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index 03e0df2..8870907 100644
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@ -1595,7 +1595,8 @@ int register_efivars(struct efivars *efivars,
 	if (!efivars->kobject) {
 		pr_err("efivars: Subsystem registration failed.\n");
 		error = -ENOMEM;
-		goto err_unreg_vars;
+		kset_unregister(efivars->kset);
+		goto out;
 	}
 
 	/*
@@ -1642,9 +1643,6 @@ int register_efivars(struct efivars *efivars,
 
 	register_filesystem(&efivarfs_type);
 
-err_unreg_vars:
-	kset_unregister(efivars->kset);
-
 out:
 	kfree(variable_name);
 
-- 
1.6.0.2

Re: [PATCH] efi: fix always unregister kset of efivars in register_efivars

[Matt Fleming]

On Mon, 2012-10-29 at 14:52 +0800, Lee, Chun-Yi wrote:
> The cc9c97b76aa7235d5a1de0f74f990097f77008b4 patch introduced a
> issue that always unregister kset of efivars in register_efivars.
> 
> This patch moved the kset_unregister function call to the kobject create check
> block for fix issue.
> 
> Cc: Matthew Garrett <mjg-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> Cc: H. Peter Anvin <hpa-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org>
> Cc: Jeremy Kerr <jeremy.kerr-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
> Cc: Matt Fleming <matt.fleming-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> Signed-off-by: Lee, Chun-Yi <jlee-IBi9RG/b67k@public.gmane.org>
> ---
>  drivers/firmware/efivars.c |    6 ++----
>  1 files changed, 2 insertions(+), 4 deletions(-)

Thanks Joey. What I ended up doing was squashing this patch with your
previous version and rebasing my 'next' branch. That way, when this
series is merged the bug will never appear.

Please take a look to make sure everything is OK.

-- 
Matt Fleming, Intel Open Source Technology Center

Re: [PATCH] efi: fix always unregister kset of efivars in register_efivars

[joeyli]

於 一，2012-10-29 於 19:11 +0000，Matt Fleming 提到：
> On Mon, 2012-10-29 at 14:52 +0800, Lee, Chun-Yi wrote:
> > The cc9c97b76aa7235d5a1de0f74f990097f77008b4 patch introduced a
> > issue that always unregister kset of efivars in register_efivars.
> > 
> > This patch moved the kset_unregister function call to the kobject create check
> > block for fix issue.
> > 
> > Cc: Matthew Garrett <mjg-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> > Cc: H. Peter Anvin <hpa-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org>
> > Cc: Jeremy Kerr <jeremy.kerr-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
> > Cc: Matt Fleming <matt.fleming-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> > Signed-off-by: Lee, Chun-Yi <jlee-IBi9RG/b67k@public.gmane.org>
> > ---
> >  drivers/firmware/efivars.c |    6 ++----
> >  1 files changed, 2 insertions(+), 4 deletions(-)
> 
> Thanks Joey. What I ended up doing was squashing this patch with your
> previous version and rebasing my 'next' branch. That way, when this
> series is merged the bug will never appear.
> 
> Please take a look to make sure everything is OK.
> 

I just check the next branch, this fix merged with patch commit eecceeb,
everything is OK.


Thanks a lot!
Joey Lee