From 2a9b19b8133ed74a3d1e680562fb8a3809967112 Mon Sep 17 00:00:00 2001
From: Julien Tinnes <jt@cr0.org>
Date: Fri, 10 Jul 2009 10:46:30 -0700
Subject: [PATCH] --- yaml --- r: 157309 b: refs/heads/master c:
 b3a633c8527ef155b1a4e22e8f5abc58f7af54c9 h: refs/heads/master i:   157307:
 c3f11a247bcc44bc10fe6fa96a1036e72eaeeb8a v: v3

---
 [refs]                            | 2 +-
 trunk/include/linux/personality.h | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d7175f6a18cd..852249598c6b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8113a8d80f4c6a3dc3724b39b470f3fee9c426b6
+refs/heads/master: b3a633c8527ef155b1a4e22e8f5abc58f7af54c9
diff --git a/trunk/include/linux/personality.h b/trunk/include/linux/personality.h
index a84e9ff9b27e..b7f578dac544 100644
--- a/trunk/include/linux/personality.h
+++ b/trunk/include/linux/personality.h
@@ -40,7 +40,11 @@ enum {
  * Security-relevant compatibility flags that must be
  * cleared upon setuid or setgid exec:
  */
-#define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC|ADDR_NO_RANDOMIZE)
+#define PER_CLEAR_ON_SETID \
+	(READ_IMPLIES_EXEC | \
+	 ADDR_NO_RANDOMIZE | \
+	 ADDR_COMPAT_LAYOUT | \
+	 MMAP_PAGE_ZERO)
 
 /*
  * Personality types.