diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-04 13:46:43 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-04 13:46:43 -0500 |
| commit | c64eae9a73a847c1698f913c893aa4012d2a30b0 (patch) | |
| tree | 732684b9ffe9dfd6e9a11b1f006eaaefeb0e945b /kernel/sys.c | |
| parent | c9e358dfc4a8cb2227172ef77908c2e0ee17bcb9 (diff) | |
| parent | ebf53826e105f488f4f628703a108e98940d1dc5 (diff) | |
Merge commit 'v2.6.38-rc3' into devicetree/next
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 31b71a276b4..18da702ec81 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 || |