lkml.org 
[lkml]   [2008]   [May]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patches in this message
    /
    Subjectsparc: Fix mremap VA span checking.
    From
    Date
    Hello guys,

    sorry for bothering you if wrong, but based on DaveM's
    patch: <cite>

    sparc: Fix mmap VA span checking.
    David S. Miller [Wed, 7 May 2008 09:24:28 +0000 (02:24 -0700)]
    [ Upstream commit: 5816339310b2d9623cf413d33e538b45e815da5d ]
    We should not conditionalize VA range checks on MAP_FIXED.
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    </cite>

    I have investigated the code for MREMAP_FIXED in
    sparc_mremap in arch/sparc/kernel/sys_sparc.c, for sys64_mremap
    in arch/sparc64/kernel/sys_sparc.c and
    for sys32_mremap in arch/sparc64/kernel/sys_sparc32.c
    and there are similar conditional range checks ->
    attaching the patches against 2.6.25.3.

    Kind regards
    Jan iankko Lieskovsky

    --- linux-2.6.25.3.old/arch/sparc/kernel/sys_sparc.c 2008-05-12 11:43:17.000000000 +0200
    +++ linux-2.6.25.3/arch/sparc/kernel/sys_sparc.c 2008-05-12 12:20:32.000000000 +0200
    @@ -308,14 +308,13 @@
    new_len > TASK_SIZE - PAGE_SIZE)
    goto out;
    down_write(&current->mm->mmap_sem);
    - if (flags & MREMAP_FIXED) {
    - if (ARCH_SUN4C_SUN4 &&
    - new_addr < 0xe0000000 &&
    - new_addr + new_len > 0x20000000)
    - goto out_sem;
    - if (new_addr + new_len > TASK_SIZE - PAGE_SIZE)
    - goto out_sem;
    - } else if ((ARCH_SUN4C_SUN4 && addr < 0xe0000000 &&
    + if (ARCH_SUN4C_SUN4 &&
    + new_addr < 0xe0000000 &&
    + new_addr + new_len > 0x20000000)
    + goto out_sem;
    + if (new_addr + new_len > TASK_SIZE - PAGE_SIZE)
    + goto out_sem;
    + else if ((ARCH_SUN4C_SUN4 && addr < 0xe0000000 &&
    addr + new_len > 0x20000000) ||
    addr + new_len > TASK_SIZE - PAGE_SIZE) {
    unsigned long map_flags = 0;--- linux-2.6.25.3.old/arch/sparc64/kernel/sys_sparc.c 2008-05-12 11:43:17.000000000 +0200
    +++ linux-2.6.25.3/arch/sparc64/kernel/sys_sparc.c 2008-05-12 12:18:58.000000000 +0200
    @@ -620,10 +620,9 @@
    goto out;

    down_write(&current->mm->mmap_sem);
    - if (flags & MREMAP_FIXED) {
    - if (invalid_64bit_range(new_addr, new_len))
    - goto out_sem;
    - } else if (invalid_64bit_range(addr, new_len)) {
    + if (invalid_64bit_range(new_addr, new_len))
    + goto out_sem;
    + else if (invalid_64bit_range(addr, new_len)) {
    unsigned long map_flags = 0;
    struct file *file = NULL;
    --- linux-2.6.25.3.old/arch/sparc64/kernel/sys_sparc32.c 2008-05-12 11:43:17.000000000 +0200
    +++ linux-2.6.25.3/arch/sparc64/kernel/sys_sparc32.c 2008-05-12 12:19:43.000000000 +0200
    @@ -915,10 +915,9 @@
    if (addr > STACK_TOP32 - old_len)
    goto out;
    down_write(&current->mm->mmap_sem);
    - if (flags & MREMAP_FIXED) {
    - if (new_addr > STACK_TOP32 - new_len)
    - goto out_sem;
    - } else if (addr > STACK_TOP32 - new_len) {
    + if (new_addr > STACK_TOP32 - new_len)
    + goto out_sem;
    + else if (addr > STACK_TOP32 - new_len) {
    unsigned long map_flags = 0;
    struct file *file = NULL;
    \
     
     \ /
      Last update: 2008-05-12 13:17    [W:0.031 / U:113.072 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site