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
This commit is contained in:
Linus Torvalds 2009-01-09 13:59:25 -08:00
Родитель 7d671f3e71 b9456371a7
Коммит 1a7d0f0bec
1 изменённых файлов: 2 добавлений и 1 удалений

Просмотреть файл

@ -372,7 +372,8 @@ int commit_creds(struct cred *new)
old->fsuid != new->fsuid || old->fsuid != new->fsuid ||
old->fsgid != new->fsgid || old->fsgid != new->fsgid ||
!cap_issubset(new->cap_permitted, old->cap_permitted)) { !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; task->pdeath_signal = 0;
smp_wmb(); smp_wmb();
} }