diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-04-21 14:42:15 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-04-21 14:42:15 +0800 |
| commit | fd9302c16fc244139c1ddfdffc145d5b772ed9ce (patch) | |
| tree | 40270feadd63149bcd43380cf3fe402a2dcd85ad /mm/process_vm_access.c | |
| parent | 9b17ba5e21b99587d7c54250059cf10fd51c74f2 (diff) | |
| parent | 6fe78bc1bfcddabbf3d210e18f91da44fa796d8a (diff) | |
Merge remote-tracking branch 'lts/linux-4.1.y' into linux-linaro-lsk-v4.1lsk-v4.1-16.04
Conflicts:
arch/arm/include/asm/psci.h
mm/memcontrol.c
Diffstat (limited to 'mm/process_vm_access.c')
| -rw-r--r-- | mm/process_vm_access.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c index e88d071648c2..5d453e58ddbf 100644 --- a/mm/process_vm_access.c +++ b/mm/process_vm_access.c @@ -194,7 +194,7 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter, goto free_proc_pages; } - mm = mm_access(task, PTRACE_MODE_ATTACH); + mm = mm_access(task, PTRACE_MODE_ATTACH_REALCREDS); if (!mm || IS_ERR(mm)) { rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH; /* |