aboutsummaryrefslogtreecommitdiffstats
path: root/fs/exec.c
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@redhat.com>2010-11-30 14:56:02 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-30 20:56:38 -0500
commit114279be2120a916e8a04feeb2ac976a10016f2f (patch)
tree866a5dfab411d18941d58f8796edab6da760213e /fs/exec.c
parent3c77f845722158206a7209c45ccddc264d19319c (diff)
exec: copy-and-paste the fixes into compat_do_execve() paths
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> Cc: stable@kernel.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/exec.c')
-rw-r--r--fs/exec.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/exec.c b/fs/exec.c
index 4303b9035fe7..d68c378a3137 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -164,7 +164,7 @@ out:
164 164
165#ifdef CONFIG_MMU 165#ifdef CONFIG_MMU
166 166
167static void acct_arg_size(struct linux_binprm *bprm, unsigned long pages) 167void acct_arg_size(struct linux_binprm *bprm, unsigned long pages)
168{ 168{
169 struct mm_struct *mm = current->mm; 169 struct mm_struct *mm = current->mm;
170 long diff = (long)(pages - bprm->vma_pages); 170 long diff = (long)(pages - bprm->vma_pages);
@@ -183,7 +183,7 @@ static void acct_arg_size(struct linux_binprm *bprm, unsigned long pages)
183#endif 183#endif
184} 184}
185 185
186static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos, 186struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
187 int write) 187 int write)
188{ 188{
189 struct page *page; 189 struct page *page;
@@ -297,11 +297,11 @@ static bool valid_arg_len(struct linux_binprm *bprm, long len)
297 297
298#else 298#else
299 299
300static inline void acct_arg_size(struct linux_binprm *bprm, unsigned long pages) 300void acct_arg_size(struct linux_binprm *bprm, unsigned long pages)
301{ 301{
302} 302}
303 303
304static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos, 304struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
305 int write) 305 int write)
306{ 306{
307 struct page *page; 307 struct page *page;