diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-02-02 01:10:03 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-02-02 01:10:06 -0500 |
| commit | 8104a4775ad8a7863af0b898224b15aa708582db (patch) | |
| tree | 71380e4db36e9d91e521d0a98be74981e32a6700 /kernel/sys.c | |
| parent | f6bbc1daac964da551130dbf01809d3fbd178b2d (diff) | |
| parent | ebf53826e105f488f4f628703a108e98940d1dc5 (diff) | |
Merge commit 'v2.6.38-rc3' into perf/core
Merge reason: Pick up latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/sys.c')
| -rw-r--r-- | kernel/sys.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index 31b71a276b40..18da702ec813 100644 --- a/kernel/sys.c +++ b/kernel/sys.c | |||
| @@ -1385,7 +1385,8 @@ static int check_prlimit_permission(struct task_struct *task) | |||
| 1385 | const struct cred *cred = current_cred(), *tcred; | 1385 | const struct cred *cred = current_cred(), *tcred; |
| 1386 | 1386 | ||
| 1387 | tcred = __task_cred(task); | 1387 | tcred = __task_cred(task); |
| 1388 | if ((cred->uid != tcred->euid || | 1388 | if (current != task && |
| 1389 | (cred->uid != tcred->euid || | ||
| 1389 | cred->uid != tcred->suid || | 1390 | cred->uid != tcred->suid || |
| 1390 | cred->uid != tcred->uid || | 1391 | cred->uid != tcred->uid || |
| 1391 | cred->gid != tcred->egid || | 1392 | cred->gid != tcred->egid || |