diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-09 13:59:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-09 13:59:25 -0800 |
| commit | 1a7d0f0bec4be078ce2cfb11538c0f4ffbbed8e5 (patch) | |
| tree | 266fafec84391c21383cfad7e6ae5ef6131f3ff1 | |
| parent | 7d671f3e713fc5ff18a5227a8dc16dfdb8bc0664 (diff) | |
| parent | b9456371a73871d001e67b5f4eac118c2c278e1c (diff) | |
| download | linux-1a7d0f0bec4be078ce2cfb11538c0f4ffbbed8e5.tar.gz linux-1a7d0f0bec4be078ce2cfb11538c0f4ffbbed8e5.tar.bz2 linux-1a7d0f0bec4be078ce2cfb11538c0f4ffbbed8e5.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
CRED: Fix commit_creds() on a process that has no mm
| -rw-r--r-- | kernel/cred.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/cred.c b/kernel/cred.c index 043f78c133c4..3a039189d707 100644 --- a/kernel/cred.c +++ b/kernel/cred.c @@ -372,7 +372,8 @@ int commit_creds(struct cred *new) old->fsuid != new->fsuid || old->fsgid != new->fsgid || !cap_issubset(new->cap_permitted, old->cap_permitted)) { - set_dumpable(task->mm, suid_dumpable); + if (task->mm) + set_dumpable(task->mm, suid_dumpable); task->pdeath_signal = 0; smp_wmb(); } |