2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------ From: Kamal Mostafa <[email protected]> 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 <[email protected]> Signed-off-by: Andi Kleen <[email protected]> BugLink: http://bugs.launchpad.net/bugs/553464 Cc: Yinghai Lu <[email protected]> Cc: Len Brown <[email protected]> Cc: Rafael J. Wysocki <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- 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; _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
