From: Greg KH Date: Wed, 30 Jan 2008 12:29:58 +0000 (+0100) Subject: kobj: fix threshold_init_device/kobject_uevent_env oops X-Git-Tag: v2.6.25-rc1~1143^2~889 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=213eca7f4888e9817e8076cdab6b9f7295c181f6;p=linux-2.6 kobj: fix threshold_init_device/kobject_uevent_env oops the logic in this function is just crazy. It's recursive, but we can circumvent the creation for the kobject and whole creation of the threshold_block if some conditions are met. That's why we see the allocate_threshold_blocks so many times in the callstack, yet only a few kobjects created. Then we blow up in kobject_uevent_env() on the first debug printk. Which means that we are just passing in garbage. Man, this is one time that comments in code would have been very nice to have, and why forward goto's into major code blocks are just evil... Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd_64.c b/arch/x86/kernel/cpu/mcheck/mce_amd_64.c index 753588755f..073afa7dd8 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_amd_64.c +++ b/arch/x86/kernel/cpu/mcheck/mce_amd_64.c @@ -450,7 +450,8 @@ recurse: if (err) goto out_free; - kobject_uevent(&b->kobj, KOBJ_ADD); + if (b) + kobject_uevent(&b->kobj, KOBJ_ADD); return err;