Messages in this thread Patch in this message | | | Date | Mon, 14 Feb 2011 13:54:17 GMT | From | tip-bot for Kamal Mostafa <> | Subject | [tip:x86/mm] x86: Fix panic when handling "mem={invalid}" param |
| |
Commit-ID: 77eed821accf5dd962b1f13bed0680e217e49112 Gitweb: http://git.kernel.org/tip/77eed821accf5dd962b1f13bed0680e217e49112 Author: Kamal Mostafa <kamal@canonical.com> AuthorDate: Thu, 3 Feb 2011 17:38:04 -0800 Committer: Ingo Molnar <mingo@elte.hu> CommitDate: Mon, 14 Feb 2011 13:15:43 +0100
x86: Fix panic when handling "mem={invalid}" param
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@canonical.com> BugLink: http://bugs.launchpad.net/bugs/553464 Cc: Yinghai Lu <yinghai@kernel.org> Cc: Len Brown <len.brown@intel.com> Cc: Rafael J. Wysocki <rjw@sisk.pl> Cc: <stable@kernel.org> # .3x: as far back as it applies LKML-Reference: <1296783486-23033-1-git-send-email-kamal@canonical.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> --- arch/x86/kernel/e820.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index 294f26d..55a59d8 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c @@ -856,6 +856,9 @@ static int __init parse_memopt(char *p) 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;
| |