Skip to content

Commit f8d7105

Browse files
Yisheng Xiegregkh
authored andcommitted
mm/mempolicy: add nodes_empty check in SYSC_migrate_pages
[ Upstream commit 0486a38 ] As in manpage of migrate_pages, the errno should be set to EINVAL when none of the node IDs specified by new_nodes are on-line and allowed by the process's current cpuset context, or none of the specified nodes contain memory. However, when test by following case: new_nodes = 0; old_nodes = 0xf; ret = migrate_pages(pid, old_nodes, new_nodes, MAX); The ret will be 0 and no errno is set. As the new_nodes is empty, we should expect EINVAL as documented. To fix the case like above, this patch check whether target nodes AND current task_nodes is empty, and then check whether AND node_states[N_MEMORY] is empty. Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Yisheng Xie <[email protected]> Acked-by: Vlastimil Babka <[email protected]> Cc: Andi Kleen <[email protected]> Cc: Chris Salls <[email protected]> Cc: Christopher Lameter <[email protected]> Cc: David Rientjes <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Naoya Horiguchi <[email protected]> Cc: Tan Xiaojun <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]> Signed-off-by: Sasha Levin <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent e6e3a48 commit f8d7105

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

mm/mempolicy.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1410,10 +1410,14 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
14101410
goto out_put;
14111411
}
14121412

1413-
if (!nodes_subset(*new, node_states[N_MEMORY])) {
1414-
err = -EINVAL;
1413+
task_nodes = cpuset_mems_allowed(current);
1414+
nodes_and(*new, *new, task_nodes);
1415+
if (nodes_empty(*new))
1416+
goto out_put;
1417+
1418+
nodes_and(*new, *new, node_states[N_MEMORY]);
1419+
if (nodes_empty(*new))
14151420
goto out_put;
1416-
}
14171421

14181422
err = security_task_movememory(task);
14191423
if (err)

0 commit comments

Comments
 (0)