From ee39a3648cc3b4e2ff1c72e5a83321fba9b04c8f Mon Sep 17 00:00:00 2001
From: David Quigley <dpquigl@tycho.nsa.gov>
Date: Fri, 23 Jun 2006 02:04:02 -0700
Subject: [PATCH] --- yaml --- r: 28959 b: refs/heads/master c:
 86c3a7645c05a7d06b72653aa4b2bea4e7229d1b h: refs/heads/master i:   28957:
 819cd35193dadc7a83e2795c0501e9f95df41924   28955:
 6bf30db3e14cd18be292d0a5fa2d8dadbb25c787   28951:
 312cc2f87331d26ce8f8072c855e25a203cf70c9   28943:
 654a55d33ae1a1ecac3893fb4ddfc3ad12047661   28927:
 ebe0d1147ef011c985e9c4364b357bbd7b404d75 v: v3

---
 [refs]               | 2 +-
 trunk/mm/mempolicy.c | 5 +++++
 trunk/mm/migrate.c   | 6 ++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5b47dfa752cd..fdc787fc0c48 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35601547baf92d984b6e59cf3583649da04baea5
+refs/heads/master: 86c3a7645c05a7d06b72653aa4b2bea4e7229d1b
diff --git a/trunk/mm/mempolicy.c b/trunk/mm/mempolicy.c
index 05b84acf0bb3..ec4a1a950df9 100644
--- a/trunk/mm/mempolicy.c
+++ b/trunk/mm/mempolicy.c
@@ -88,6 +88,7 @@
 #include <linux/proc_fs.h>
 #include <linux/migrate.h>
 #include <linux/rmap.h>
+#include <linux/security.h>
 
 #include <asm/tlbflush.h>
 #include <asm/uaccess.h>
@@ -942,6 +943,10 @@ asmlinkage long sys_migrate_pages(pid_t pid, unsigned long maxnode,
 		goto out;
 	}
 
+	err = security_task_movememory(task);
+	if (err)
+		goto out;
+
 	err = do_migrate_pages(mm, &old, &new,
 		capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
 out:
diff --git a/trunk/mm/migrate.c b/trunk/mm/migrate.c
index 033a12f4c949..1c2a71aa05cd 100644
--- a/trunk/mm/migrate.c
+++ b/trunk/mm/migrate.c
@@ -27,6 +27,7 @@
 #include <linux/writeback.h>
 #include <linux/mempolicy.h>
 #include <linux/vmalloc.h>
+#include <linux/security.h>
 
 #include "internal.h"
 
@@ -905,6 +906,11 @@ asmlinkage long sys_move_pages(pid_t pid, unsigned long nr_pages,
 		goto out2;
 	}
 
+ 	err = security_task_movememory(task);
+ 	if (err)
+ 		goto out2;
+
+
 	task_nodes = cpuset_mems_allowed(task);
 
 	/* Limit nr_pages so that the multiplication may not overflow */