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 #include #include +#include #include #include @@ -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 #include #include +#include #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 */