linux-mips
[Top] [All Lists]

[PATCH] MIPS: Add len and addr validation for MAP_FIXED mappings.

To: linux-mips <linux-mips@linux-mips.org>
Subject: [PATCH] MIPS: Add len and addr validation for MAP_FIXED mappings.
From: David Daney <ddaney@avtrex.com>
Date: Sat, 27 Oct 2007 23:10:20 -0700
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
User-agent: Thunderbird 1.5.0.12 (X11/20070719)
From: David Daney  <ddaney@avtrex.com>

mmap with MAP_FIXED was not validating the addr and len parameters.
This leads to the failure of GCC's gcc.c-torture/execute/loop-2[fg].c
testcases when using the o32 ABI on a 64 bit kernel.

These testcases try to mmap 65536 bytes at 0x7fff8000 and then access
all the memory.  In 2.6.18 and 2.6.23.1 (and likely other versions as
well) the kernel maps the requested memory, but since half of it is
above 0x80000000 a SIGBUS is generated when it is accessed.

This patch moves the len validation above the MAP_FIXED processing so
that it is always validated.  It also adds validation to the addr
parameter for MAP_FIXED mappings.

The patch is against 2.6.23.1 from kernel.org and was tested in a 64
bit big-endian kernel.

Signed-off-by: David Daney  <ddaney@avtrex.com>
---
--- ../linux-2.6.23.1-clean/arch/mips/kernel/syscall.c  2007-10-12 
09:43:44.000000000 -0700
+++ arch/mips/kernel/syscall.c  2007-10-25 23:10:23.000000000 -0700
@@ -73,7 +73,14 @@ unsigned long arch_get_unmapped_area(str

        task_size = STACK_TOP;

+       if (len > task_size)
+               return -ENOMEM;
+
        if (flags & MAP_FIXED) {
+               /* Even MAP_FIXED mappings must reside within task_size.  */
+               if (task_size - len < addr)
+                       return -EINVAL;
+
                /*
                 * We do not accept a shared mapping if it would violate
                 * cache aliasing constraints.
@@ -83,8 +90,6 @@ unsigned long arch_get_unmapped_area(str
                return addr;
        }

-       if (len > task_size)
-               return -ENOMEM;
        do_color_align = 0;
        if (filp || (flags & MAP_SHARED))
                do_color_align = 1;



<Prev in Thread] Current Thread [Next in Thread>