From 1037b2787b6df12f31b7051f7cdbb289f7972ee7 Mon Sep 17 00:00:00 2001 From: Sudip Mukherjee Date: Mon, 13 Jul 2015 17:32:28 +0530 Subject: char: misc: fix error path Lets call remove_proc_entry() in the error path only if we have successfully created "misc" in procfs. Signed-off-by: Sudip Mukherjee Signed-off-by: Greg Kroah-Hartman --- drivers/char/misc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'drivers/char') diff --git a/drivers/char/misc.c b/drivers/char/misc.c index 3b95795cb640..c83ef9652bc9 100644 --- a/drivers/char/misc.c +++ b/drivers/char/misc.c @@ -281,8 +281,9 @@ static char *misc_devnode(struct device *dev, umode_t *mode) static int __init misc_init(void) { int err; + struct proc_dir_entry *ret; - proc_create("misc", 0, NULL, &misc_proc_fops); + ret = proc_create("misc", 0, NULL, &misc_proc_fops); misc_class = class_create(THIS_MODULE, "misc"); err = PTR_ERR(misc_class); if (IS_ERR(misc_class)) @@ -298,7 +299,8 @@ fail_printk: printk("unable to get major %d for misc devices\n", MISC_MAJOR); class_destroy(misc_class); fail_remove: - remove_proc_entry("misc", NULL); + if (ret) + remove_proc_entry("misc", NULL); return err; } subsys_initcall(misc_init); -- cgit v1.2.1