[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20110330210713.BC6583E1A05@tassilo.jf.intel.com>
Date: Wed, 30 Mar 2011 14:07:13 -0700 (PDT)
From: Andi Kleen <andi@...stfloor.org>
To: kamal@...onical.com, ak@...ux.intel.com, yinghai@...nel.org,
len.brown@...el.com, rjw@...k.pl, mingo@...e.hu, gregkh@...e.de,
linux-kernel@...r.kernel.org, stable@...nel.org,
tim.bird@...sony.com
Subject: [PATCH] [190/275] x86: Fix panic when handling "mem={invalid}" param
2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Kamal Mostafa <kamal@...onical.com>
commit 77eed821accf5dd962b1f13bed0680e217e49112 upstream.
Avoid removing all of memory and panicing when "mem={invalid}"
is specified, e.g. mem=blahblah, mem=0, or mem=nopentium (on
platforms other than x86_32).
Signed-off-by: Kamal Mostafa <kamal@...onical.com>
Signed-off-by: Andi Kleen <ak@...ux.intel.com>
BugLink: http://bugs.launchpad.net/bugs/553464
Cc: Yinghai Lu <yinghai@...nel.org>
Cc: Len Brown <len.brown@...el.com>
Cc: Rafael J. Wysocki <rjw@...k.pl>
LKML-Reference: <1296783486-23033-1-git-send-email-kamal@...onical.com>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
Signed-off-by: Greg Kroah-Hartman <gregkh@...e.de>
---
arch/x86/kernel/e820.c | 3 +++
1 file changed, 3 insertions(+)
Index: linux-2.6.35.y/arch/x86/kernel/e820.c
===================================================================
--- linux-2.6.35.y.orig/arch/x86/kernel/e820.c 2011-03-29 22:50:45.435095848 -0700
+++ linux-2.6.35.y/arch/x86/kernel/e820.c 2011-03-29 23:54:16.526579552 -0700
@@ -989,6 +989,9 @@
userdef = 1;
mem_size = memparse(p, &p);
+ /* don't remove all of memory when handling "mem={invalid}" param */
+ if (mem_size == 0)
+ return -EINVAL;
e820_remove_range(mem_size, ULLONG_MAX - mem_size, E820_RAM, 1);
return 0;
--
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/
Powered by blists - more mailing lists