From: Cyrill Gorcunov <gorcunov@openvz.org>
To: Ingo Molnar <mingo@elte.hu>
Cc: "H. Peter Anvin" <hpa@zytor.com>,
Thomas Gleixner <tglx@linutronix.de>,
LKML <linux-kernel@vger.kernel.org>,
Jack Steiner <steiner@sgi.com>
Subject: [PATCH -tip] x86: uv - prevent NULL dereference in uv_system_init
Date: Fri, 1 May 2009 23:56:38 +0400 [thread overview]
Message-ID: <20090501195638.GC4633@lenovo> (raw)
We may reach NULL dereference oops if kmalloc failed.
Lets do panic better with sensible message.
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
---
Actually there is a dubious place as well at early_get_nodeid.
Is there a guarantee that we _never_ fail in early_ioremap?
arch/x86/kernel/apic/x2apic_uv_x.c | 9 +++++++++
1 file changed, 9 insertions(+)
Index: linux-2.6.git/arch/x86/kernel/apic/x2apic_uv_x.c
=====================================================================
--- linux-2.6.git.orig/arch/x86/kernel/apic/x2apic_uv_x.c
+++ linux-2.6.git/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -584,15 +584,21 @@ void __init uv_system_init(void)
bytes = sizeof(struct uv_blade_info) * uv_num_possible_blades();
uv_blade_info = kmalloc(bytes, GFP_KERNEL);
+ if (!uv_blade_info)
+ goto err_nomem;
get_lowmem_redirect(&lowmem_redir_base, &lowmem_redir_size);
bytes = sizeof(uv_node_to_blade[0]) * num_possible_nodes();
uv_node_to_blade = kmalloc(bytes, GFP_KERNEL);
+ if (!uv_node_to_blade)
+ goto err_nomem;
memset(uv_node_to_blade, 255, bytes);
bytes = sizeof(uv_cpu_to_blade[0]) * num_possible_cpus();
uv_cpu_to_blade = kmalloc(bytes, GFP_KERNEL);
+ if (!uv_cpu_to_blade)
+ goto err_nomem;
memset(uv_cpu_to_blade, 255, bytes);
blade = 0;
@@ -667,4 +673,7 @@ void __init uv_system_init(void)
uv_cpu_init();
uv_scir_register_cpu_notifier();
proc_mkdir("sgi_uv", NULL);
+
+err_nomem:
+ panic("UV: Out of memory\n");
}
next reply other threads:[~2009-05-01 19:57 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-01 19:56 Cyrill Gorcunov [this message]
2009-05-01 20:03 ` [PATCH -tip] x86: uv - prevent NULL dereference in uv_system_init Ingo Molnar
2009-05-01 20:09 ` Cyrill Gorcunov
2009-05-01 20:25 ` Cyrill Gorcunov
2009-05-01 20:31 ` Jack Steiner
2009-05-03 8:48 ` Ingo Molnar
2009-05-03 9:01 ` Cyrill Gorcunov
2009-05-03 9:09 ` David Rientjes
2009-05-03 9:38 ` Cyrill Gorcunov
2009-05-03 9:53 ` David Rientjes
2009-05-03 9:59 ` Pekka Enberg
2009-05-03 12:12 ` Cyrill Gorcunov
2009-05-03 12:27 ` Pekka Enberg
2009-05-03 14:38 ` Cyrill Gorcunov
2009-05-03 16:54 ` Pekka Enberg
2009-05-03 17:23 ` introducing __GFP_PANIC Cyrill Gorcunov
2009-05-03 17:38 ` Pekka Enberg
2009-05-03 17:49 ` Cyrill Gorcunov
2009-05-03 20:45 ` Cyrill Gorcunov
2009-05-03 20:58 ` David Rientjes
2009-05-04 8:14 ` Cyrill Gorcunov
2009-05-04 8:32 ` Pekka Enberg
2009-05-04 8:49 ` Cyrill Gorcunov
2009-05-04 9:56 ` Pekka Enberg
2009-05-04 9:08 ` Cyrill Gorcunov
2009-05-04 9:57 ` Pekka Enberg
2009-05-04 10:01 ` Cyrill Gorcunov
2009-05-04 10:11 ` Cyrill Gorcunov
2009-05-04 10:33 ` Pekka Enberg
2009-05-04 10:52 ` Cyrill Gorcunov
2009-05-04 10:56 ` David Rientjes
2009-05-04 11:10 ` Cyrill Gorcunov
2009-05-04 16:58 ` [tip:x86/apic] x86: uv - prevent NULL dereference in uv_system_init() tip-bot for Cyrill Gorcunov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090501195638.GC4633@lenovo \
--to=gorcunov@openvz.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=steiner@sgi.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.