[patch 2/2] efivars: handle errors from register_efivars()

Subsystems: the rest

STALE5690d

2 messages, 2 authors, 2011-03-18 · open the first message on its own page

[patch 2/2] efivars: handle errors from register_efivars()

From: Dan Carpenter <hidden>
Date: 2011-03-18 07:12:58

We should unwind and return an error if register_efivars() fails.

Signed-off-by: Dan Carpenter <redacted>
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index ff2fe40..5d1ec68 100644
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@ -803,6 +803,8 @@ efivars_init(void)
 	ops.set_variable = efi.set_variable;
 	ops.get_next_variable = efi.get_next_variable;
 	error = register_efivars(&__efivars, &ops, efi_kobj);
+	if (error)
+		goto err_put;
 
 	/* Don't forget the systab entry */
 	error = sysfs_create_group(efi_kobj, &efi_subsys_attr_group);
@@ -810,10 +812,15 @@ efivars_init(void)
 		printk(KERN_ERR
 		       "efivars: Sysfs attribute export failed with error %d.\n",
 		       error);
-		unregister_efivars(&__efivars);
-		kobject_put(efi_kobj);
+		goto err_unregister;
 	}
 
+	return 0;
+
+err_unregister:
+	unregister_efivars(&__efivars);
+err_put:
+	kobject_put(efi_kobj);
 	return error;
 }
 

Re: [patch 2/2] efivars: handle errors from register_efivars()

From: Mike Waychison <hidden>
Date: 2011-03-18 09:24:44

On Fri, Mar 18, 2011 at 12:12 AM, Dan Carpenter [off-list ref] wrote:
We should unwind and return an error if register_efivars() fails.

Signed-off-by: Dan Carpenter <redacted>
Acked-by: Mike Waychison <redacted>
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help