diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-09-05 12:52:33 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-09-05 12:52:33 +0900 |
| commit | f1e0477a7b7a541f51eea279910eed4ddd010033 (patch) | |
| tree | 552841f13496306f0140d5faca82ae9987a81b5e /kernel/cred.c | |
| parent | b58c580d996655658975aa8042b43b7d579f3986 (diff) | |
| parent | 9e79e3e9dd9672b37ac9412e9a926714306551fe (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest
Diffstat (limited to 'kernel/cred.c')
| -rw-r--r-- | kernel/cred.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/cred.c b/kernel/cred.c index 174fa84eca3..8ef31f53c44 100644 --- a/kernel/cred.c +++ b/kernel/cred.c @@ -508,10 +508,8 @@ int commit_creds(struct cred *new) key_fsgid_changed(task); /* do it - * - What if a process setreuid()'s and this brings the - * new uid over his NPROC rlimit? We can check this now - * cheaply with the new uid cache, so if it matters - * we should be checking for it. -DaveM + * RLIMIT_NPROC limits on user->processes have already been checked + * in set_user(). */ alter_cred_subscribers(new, 2); if (new->user != old->user) |