Avoid pgoff overflow in remap_file_pages
authorLarry Woodman <lwoodman@redhat.com>
Fri, 24 Sep 2010 16:04:48 +0000 (12:04 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 25 Sep 2010 16:34:58 +0000 (09:34 -0700)
Thomas Pollet noticed that the remap_file_pages() system call in
fremap.c has a potential overflow in the first part of the if statement
below, which could cause it to process bogus input parameters.
Specifically the pgoff + size parameters could be wrap thereby
preventing the system call from failing when it should.

Reported-by: Thomas Pollet <thomas.pollet@gmail.com>
Signed-off-by: Larry Woodman <lwoodman@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
mm/fremap.c

index 7b7f852848de5430ff5f721d3aba0c5332b19dce..ec520c7b28dffedb5027de6b27834831938671cd 100644 (file)
@@ -141,6 +141,10 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
        if (start + size <= start)
                return err;
 
+       /* Does pgoff wrap? */
+       if (pgoff + (size >> PAGE_SHIFT) < pgoff)
+               return err;
+
        /* Can we represent this offset inside this architecture's pte's? */
 #if PTE_FILE_MAX_BITS < BITS_PER_LONG
        if (pgoff + (size >> PAGE_SHIFT) >= (1UL << PTE_FILE_MAX_BITS))