linux-kernel - [PATCH] lib/kobject: simplify function kobject

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1341475102-10433-1-git-send-email-haodong@linux.vnet.ibm.com>
Date:	Thu,  5 Jul 2012 15:58:22 +0800
From:	Dong Hao <haodong@...ux.vnet.ibm.com>
To:	gregkh@...uxfoundation.org
Cc:	linux-kernel@...r.kernel.org, Dong Hao <haodong@...ux.vnet.ibm.com>
Subject: [PATCH] lib/kobject: simplify function kobject_init

From: Hao Dong <haodong@...ux.vnet.ibm.com> 

The printk() at end of function kobject_init() already had "\n",
so remove "\n".

While the kobject has been initialized, assign error string and
jump to error case directly.

Signed-off-by: Dong Hao<haodong@...ux.vnet.ibm.com>
---
 lib/kobject.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/kobject.c b/lib/kobject.c
index c6e201a..cab2fc9 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -276,14 +276,13 @@ void kobject_init(struct kobject *kobj, struct kobj_type *ktype)
 		goto error;
 	}
 	if (!ktype) {
-		err_str = "must have a ktype to be initialized properly!\n";
+		err_str = "must have a ktype to be initialized properly!";
 		goto error;
 	}
 	if (kobj->state_initialized) {
 		/* do not error out as sometimes we can recover */
-		printk(KERN_ERR "kobject (%p): tried to init an initialized "
-		       "object, something is seriously wrong.\n", kobj);
-		dump_stack();
+		err_str = "tried to init an initialized object, something is seriously wrong.";
+		goto error;
 	}
 
 	kobject_init_internal(kobj);
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/