- mprotect-patch-for-use-by-slim.patch removed from -mm tree

[akpm]

The patch titled
     mprotect patch for use by SLIM
has been removed from the -mm tree.  Its filename was
     mprotect-patch-for-use-by-slim.patch

This patch was dropped because this work seems to be stalled

------------------------------------------------------
Subject: mprotect patch for use by SLIM
From: Kylene Jo Hall <[EMAIL PROTECTED]>

This small patch makes mprotect available for use by SLIM for write
revocation.

Updated to allow the usage locking to work properly.

Signed-off-by: Mimi Zohar <[EMAIL PROTECTED]>
Signed-off-by: Kylene Hall <[EMAIL PROTECTED]>
Cc: Dave Safford <[EMAIL PROTECTED]>
Cc: Mimi Zohar <[EMAIL PROTECTED]>
Cc: Serge Hallyn <[EMAIL PROTECTED]>
Cc: Chris Wright <[EMAIL PROTECTED]>
Cc: Stephen Smalley <[EMAIL PROTECTED]>
Cc: James Morris <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 include/linux/mm.h |    2 ++
 mm/mprotect.c      |   22 ++++++++++++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)

diff -puN include/linux/mm.h~mprotect-patch-for-use-by-slim include/linux/mm.h
--- a/include/linux/mm.h~mprotect-patch-for-use-by-slim
+++ a/include/linux/mm.h
@@ -141,6 +141,8 @@ extern unsigned int kobjsize(const void 
 #define VM_EXEC                0x00000004
 #define VM_SHARED      0x00000008
 
+extern int do_mprotect(unsigned long start, size_t len, unsigned long prot);
+
 /* mprotect() hardcodes VM_MAYREAD >> 4 == VM_READ, and so for r/w/x bits. */
 #define VM_MAYREAD     0x00000010      /* limits for mprotect() etc */
 #define VM_MAYWRITE    0x00000020
diff -puN mm/mprotect.c~mprotect-patch-for-use-by-slim mm/mprotect.c
--- a/mm/mprotect.c~mprotect-patch-for-use-by-slim
+++ a/mm/mprotect.c
@@ -19,6 +19,7 @@
 #include <linux/mempolicy.h>
 #include <linux/personality.h>
 #include <linux/syscalls.h>
+#include <linux/module.h>
 #include <linux/swap.h>
 #include <linux/swapops.h>
 #include <asm/uaccess.h>
@@ -213,9 +214,10 @@ fail:
        vm_unacct_memory(charged);
        return error;
 }
-
-asmlinkage long
-sys_mprotect(unsigned long start, size_t len, unsigned long prot)
+/*
+ * Call holding the current->mm->mmap_sem for writing
+ */
+int do_mprotect(unsigned long start, size_t len, unsigned long prot)
 {
        unsigned long vm_flags, nstart, end, tmp, reqprot;
        struct vm_area_struct *vma, *prev;
@@ -245,8 +247,6 @@ sys_mprotect(unsigned long start, size_t
 
        vm_flags = calc_vm_prot_bits(prot);
 
-       down_write(&current->mm->mmap_sem);
-
        vma = find_vma_prev(current->mm, start, &prev);
        error = -ENOMEM;
        if (!vma)
@@ -309,6 +309,16 @@ sys_mprotect(unsigned long start, size_t
                }
        }
 out:
-       up_write(&current->mm->mmap_sem);
        return error;
 }
+
+asmlinkage long
+sys_mprotect(unsigned long start, size_t len, unsigned long prot)
+{
+       int ret;
+
+       down_write(&current->mm->mmap_sem);
+       ret = do_mprotect(start, len, prot);
+       up_write(&current->mm->mmap_sem);
+       return ret;
+}
_

Patches currently in -mm which might be from [EMAIL PROTECTED] are

use-menuconfig-objects-ii-tpm.patch
mprotect-patch-for-use-by-slim.patch
integrity-service-api-and-dummy-provider.patch
slim-main-patch.patch
slim-secfs-patch.patch
slim-make-and-config-stuff.patch
slim-debug-output.patch
slim-documentation.patch
integrity-new-hooks.patch
integrity-fs-hook-placement.patch
integrity-evm-as-an-integrity-service-provider.patch
integrity-ima-integrity_measure-support.patch
integrity-ima-identifiers.patch
integrity-ima-cleanup.patch
integrity-tpm-internal-kernel-interface.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html