diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-03 12:16:03 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-03 12:16:03 -0500 |
| commit | 801c63c38ae52e8bfb3f6518de00a0be22c55f9a (patch) | |
| tree | bb7b9539f2f2b8077a04c2df3b60ac8cc8fa692d /fs/exec.c | |
| parent | 1ed82ae3df3882bfcb5bfe5e9f97e4e8e23af299 (diff) | |
| parent | 348edc59a8f9b9a66700781d972c24a46a79ae86 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'fs/exec.c')
| -rw-r--r-- | fs/exec.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/exec.c b/fs/exec.c index 0e1c95074d42..0b515ac53134 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -885,6 +885,12 @@ int flush_old_exec(struct linux_binprm * bprm) current->flags &= ~PF_RANDOMIZE; flush_thread(); + /* Set the new mm task size. We have to do that late because it may + * depend on TIF_32BIT which is only updated in flush_thread() on + * some architectures like powerpc + */ + current->mm->task_size = TASK_SIZE; + if (bprm->e_uid != current->euid || bprm->e_gid != current->egid || file_permission(bprm->file, MAY_READ) || (bprm->interp_flags & BINPRM_FLAGS_ENFORCE_NONDUMP)) { |