On Thu, Jun 28, 2007 at 03:43:21AM -0700, Andrew Morton wrote:
>...
> Changes since 2.6.22-rc4-mm2:
>...
> +git-selinux-disable-mmap_min_addr-by-default.patch
> 
>  Fix git-selinux
>...


This became dead code.

Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>

---

 security/selinux/hooks.c |    7 -------
 1 file changed, 7 deletions(-)

--- linux-2.6.22-rc6-mm1/security/selinux/hooks.c.old   2007-07-01 
21:35:36.000000000 +0200
+++ linux-2.6.22-rc6-mm1/security/selinux/hooks.c       2007-07-01 
21:35:48.000000000 +0200
@@ -112,9 +112,6 @@
 /* Original (dummy) security module. */
 static struct security_operations *original_ops = NULL;
 
-/* Did we enable minimum mmap address checking? */
-static int enabled_mmap_min_addr;
-
 /* Minimal support for a secondary security module,
    just to allow the use of the dummy or capability modules.
    The owlsm module can alternatively be used as a secondary
@@ -5079,10 +5076,6 @@
        selinux_disabled = 1;
        selinux_enabled = 0;
 
-       /* Disable minimum mmap address check only if we enabled it */
-       if (enabled_mmap_min_addr)
-               mmap_min_addr = 0;
-
        /* Reset security_ops to the secondary module, dummy or capability. */
        security_ops = secondary_ops;
 

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to