[PATCH] mmap.c (do_mmap_pgoff) against 2.4.19/2.4.20-pre10, better format.

DervishD (raul@pleyades.net)
Mon, 14 Oct 2002 13:07:03 +0200


--k+w/mQv8wyuph6w0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit

Hi all :))

This time the patch is 'good looking', as per the warning Russell
issued over the format of the last patch (Thanks Russell ;)))

Raśl

--k+w/mQv8wyuph6w0
Content-Type: text/plain; charset=iso-8859-1
Content-Description: mmap.c.diff
Content-Disposition: attachment; filename="mmap.c.diff"

--- linux/mm/mmap.c.orig 2002-10-14 11:16:40.000000000 +0200
+++ linux/mm/mmap.c 2002-10-14 11:19:32.000000000 +0200
@@ -390,6 +390,12 @@
return 0;
}

+
+/*
+ * NOTE: in this function we rely on TASK_SIZE being lower than
+ * SIZE_MAX-PAGE_SIZE at least. I'm pretty sure that it is.
+ */
+
unsigned long do_mmap_pgoff(struct file * file, unsigned long addr, unsigned long len,
unsigned long prot, unsigned long flags, unsigned long pgoff)
{
@@ -403,12 +409,14 @@
if (file && (!file->f_op || !file->f_op->mmap))
return -ENODEV;

- if ((len = PAGE_ALIGN(len)) == 0)
+ if (!len)
return addr;

if (len > TASK_SIZE)
return -EINVAL;

+ len = PAGE_ALIGN(len); /* This cannot be zero now */
+
/* offset overflow? */
if ((pgoff + (len >> PAGE_SHIFT)) < pgoff)
return -EINVAL;

--k+w/mQv8wyuph6w0--
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/