diff options
| author | Oleg Nesterov <oleg@redhat.com> | 2010-11-30 20:56:02 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-09 13:32:57 -0800 |
| commit | b7d121bbfa6b005a07cdb4bf2c81f9f983376dab (patch) | |
| tree | f664242277d9a21b9eba13e2f9a085b1a2ad36c1 /include | |
| parent | 35cc70fc58822eff26b1c3f680244233f4fc09a5 (diff) | |
| download | linux-3.10-b7d121bbfa6b005a07cdb4bf2c81f9f983376dab.tar.gz linux-3.10-b7d121bbfa6b005a07cdb4bf2c81f9f983376dab.tar.bz2 linux-3.10-b7d121bbfa6b005a07cdb4bf2c81f9f983376dab.zip | |
exec: copy-and-paste the fixes into compat_do_execve() paths
commit 114279be2120a916e8a04feeb2ac976a10016f2f upstream.
Note: this patch targets 2.6.37 and tries to be as simple as possible.
That is why it adds more copy-and-paste horror into fs/compat.c and
uglifies fs/exec.c, this will be cleanuped later.
compat_copy_strings() plays with bprm->vma/mm directly and thus has
two problems: it lacks the RLIMIT_STACK check and argv/envp memory
is not visible to oom killer.
Export acct_arg_size() and get_arg_page(), change compat_copy_strings()
to use get_arg_page(), change compat_do_execve() to do acct_arg_size(0)
as do_execve() does.
Add the fatal_signal_pending/cond_resched checks into compat_count() and
compat_copy_strings(), this matches the code in fs/exec.c and certainly
makes sense.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/binfmts.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h index 7c87796d20d..64a7114a939 100644 --- a/include/linux/binfmts.h +++ b/include/linux/binfmts.h @@ -60,6 +60,10 @@ struct linux_binprm{ unsigned long loader, exec; }; +extern void acct_arg_size(struct linux_binprm *bprm, unsigned long pages); +extern struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos, + int write); + #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0 #define BINPRM_FLAGS_ENFORCE_NONDUMP (1 << BINPRM_FLAGS_ENFORCE_NONDUMP_BIT) |