lkml.org 
[lkml]   [2011]   [Mar]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[23/87] x86: Fix panic when handling "mem={invalid}" param
    2.6.37-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Kamal Mostafa <kamal@canonical.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@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>
    LKML-Reference: <1296783486-23033-1-git-send-email-kamal@canonical.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    arch/x86/kernel/e820.c | 3 +++
    1 file changed, 3 insertions(+)

    --- a/arch/x86/kernel/e820.c
    +++ b/arch/x86/kernel/e820.c
    @@ -855,6 +855,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;



    \
     
     \ /
      Last update: 2011-03-22 00:53    [W:0.019 / U:0.260 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site