diff options
Diffstat (limited to 'fs/exec.c')
-rw-r--r-- | fs/exec.c | 15 |
1 files changed, 5 insertions, 10 deletions
@@ -50,15 +50,12 @@ | |||
50 | #include <linux/cn_proc.h> | 50 | #include <linux/cn_proc.h> |
51 | #include <linux/audit.h> | 51 | #include <linux/audit.h> |
52 | #include <linux/tracehook.h> | 52 | #include <linux/tracehook.h> |
53 | #include <linux/kmod.h> | ||
53 | 54 | ||
54 | #include <asm/uaccess.h> | 55 | #include <asm/uaccess.h> |
55 | #include <asm/mmu_context.h> | 56 | #include <asm/mmu_context.h> |
56 | #include <asm/tlb.h> | 57 | #include <asm/tlb.h> |
57 | 58 | ||
58 | #ifdef CONFIG_KMOD | ||
59 | #include <linux/kmod.h> | ||
60 | #endif | ||
61 | |||
62 | #ifdef __alpha__ | 59 | #ifdef __alpha__ |
63 | /* for /sbin/loader handling in search_binary_handler() */ | 60 | /* for /sbin/loader handling in search_binary_handler() */ |
64 | #include <linux/a.out.h> | 61 | #include <linux/a.out.h> |
@@ -391,7 +388,7 @@ static int count(char __user * __user * argv, int max) | |||
391 | if (!p) | 388 | if (!p) |
392 | break; | 389 | break; |
393 | argv++; | 390 | argv++; |
394 | if(++i > max) | 391 | if (i++ >= max) |
395 | return -E2BIG; | 392 | return -E2BIG; |
396 | cond_resched(); | 393 | cond_resched(); |
397 | } | 394 | } |
@@ -825,8 +822,6 @@ static int de_thread(struct task_struct *tsk) | |||
825 | schedule(); | 822 | schedule(); |
826 | } | 823 | } |
827 | 824 | ||
828 | if (unlikely(task_child_reaper(tsk) == leader)) | ||
829 | task_active_pid_ns(tsk)->child_reaper = tsk; | ||
830 | /* | 825 | /* |
831 | * The only record we have of the real-time age of a | 826 | * The only record we have of the real-time age of a |
832 | * process, regardless of execs it's done, is start_time. | 827 | * process, regardless of execs it's done, is start_time. |
@@ -1189,7 +1184,7 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs) | |||
1189 | return retval; | 1184 | return retval; |
1190 | 1185 | ||
1191 | /* Remember if the application is TASO. */ | 1186 | /* Remember if the application is TASO. */ |
1192 | bprm->sh_bang = eh->ah.entry < 0x100000000UL; | 1187 | bprm->taso = eh->ah.entry < 0x100000000UL; |
1193 | 1188 | ||
1194 | bprm->file = file; | 1189 | bprm->file = file; |
1195 | bprm->loader = loader; | 1190 | bprm->loader = loader; |
@@ -1247,8 +1242,8 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs) | |||
1247 | read_unlock(&binfmt_lock); | 1242 | read_unlock(&binfmt_lock); |
1248 | if (retval != -ENOEXEC || bprm->mm == NULL) { | 1243 | if (retval != -ENOEXEC || bprm->mm == NULL) { |
1249 | break; | 1244 | break; |
1250 | #ifdef CONFIG_KMOD | 1245 | #ifdef CONFIG_MODULES |
1251 | }else{ | 1246 | } else { |
1252 | #define printable(c) (((c)=='\t') || ((c)=='\n') || (0x20<=(c) && (c)<=0x7e)) | 1247 | #define printable(c) (((c)=='\t') || ((c)=='\n') || (0x20<=(c) && (c)<=0x7e)) |
1253 | if (printable(bprm->buf[0]) && | 1248 | if (printable(bprm->buf[0]) && |
1254 | printable(bprm->buf[1]) && | 1249 | printable(bprm->buf[1]) && |