diff options
| author |   Jeff Garzik <jgarzik@pobox.com> | 2005-09-24 00:26:49 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-24 00:26:49 -0400 |
| commit | 98ed72deebfd2b55b7e1bb94c8175b1169999212 (patch) | |
| tree | f1682a68f65e0a38159f55a58c054779d749f8df /fs/exec.c | |
| parent | Merge /spare/repo/linux-2.6/ (diff) | |
| parent | Merge branch 'upstream' from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff) | |
| download | linux-dev-98ed72deebfd2b55b7e1bb94c8175b1169999212.tar.xz linux-dev-98ed72deebfd2b55b7e1bb94c8175b1169999212.zip | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'fs/exec.c')
| -rw-r--r-- | fs/exec.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/fs/exec.c b/fs/exec.c index 14dd03907ccb..a04a575ad433 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -421,11 +421,6 @@ int setup_arg_pages(struct linux_binprm *bprm, if (!mpnt) return -ENOMEM; - if (security_vm_enough_memory(arg_size >> PAGE_SHIFT)) { - kmem_cache_free(vm_area_cachep, mpnt); - return -ENOMEM; - } - memset(mpnt, 0, sizeof(*mpnt)); down_write(&mm->mmap_sem); @@ -745,8 +740,8 @@ static inline int de_thread(struct task_struct *tsk) } /* - * Now there are really no other threads at all, - * so it's safe to stop telling them to kill themselves. + * There may be one thread left which is just exiting, + * but it's safe to stop telling the group to kill themselves. */ sig->flags = 0; @@ -785,7 +780,6 @@ no_thread_group: kmem_cache_free(sighand_cachep, oldsighand); } - BUG_ON(!thread_group_empty(current)); BUG_ON(!thread_group_leader(current)); return 0; } |