diff options
Diffstat (limited to 'fs/exec.c')
| -rw-r--r-- | fs/exec.c | 8 |
1 files changed, 5 insertions, 3 deletions
| @@ -97,6 +97,7 @@ static inline void put_binfmt(struct linux_binfmt * fmt) | |||
| 97 | module_put(fmt->module); | 97 | module_put(fmt->module); |
| 98 | } | 98 | } |
| 99 | 99 | ||
| 100 | #ifdef CONFIG_USELIB | ||
| 100 | /* | 101 | /* |
| 101 | * Note that a shared library must be both readable and executable due to | 102 | * Note that a shared library must be both readable and executable due to |
| 102 | * security reasons. | 103 | * security reasons. |
| @@ -156,6 +157,7 @@ exit: | |||
| 156 | out: | 157 | out: |
| 157 | return error; | 158 | return error; |
| 158 | } | 159 | } |
| 160 | #endif /* #ifdef CONFIG_USELIB */ | ||
| 159 | 161 | ||
| 160 | #ifdef CONFIG_MMU | 162 | #ifdef CONFIG_MMU |
| 161 | /* | 163 | /* |
| @@ -1619,9 +1621,9 @@ SYSCALL_DEFINE3(execve, | |||
| 1619 | return do_execve(getname(filename), argv, envp); | 1621 | return do_execve(getname(filename), argv, envp); |
| 1620 | } | 1622 | } |
| 1621 | #ifdef CONFIG_COMPAT | 1623 | #ifdef CONFIG_COMPAT |
| 1622 | asmlinkage long compat_sys_execve(const char __user * filename, | 1624 | COMPAT_SYSCALL_DEFINE3(execve, const char __user *, filename, |
| 1623 | const compat_uptr_t __user * argv, | 1625 | const compat_uptr_t __user *, argv, |
| 1624 | const compat_uptr_t __user * envp) | 1626 | const compat_uptr_t __user *, envp) |
| 1625 | { | 1627 | { |
| 1626 | return compat_do_execve(getname(filename), argv, envp); | 1628 | return compat_do_execve(getname(filename), argv, envp); |
| 1627 | } | 1629 | } |
