diff options
Diffstat (limited to 'kernel/sys.c')
-rw-r--r-- | kernel/sys.c | 311 |
1 files changed, 153 insertions, 158 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index 265b37690421..81f56445fba9 100644 --- a/kernel/sys.c +++ b/kernel/sys.c | |||
@@ -47,6 +47,7 @@ | |||
47 | #include <linux/syscalls.h> | 47 | #include <linux/syscalls.h> |
48 | #include <linux/kprobes.h> | 48 | #include <linux/kprobes.h> |
49 | #include <linux/user_namespace.h> | 49 | #include <linux/user_namespace.h> |
50 | #include <linux/binfmts.h> | ||
50 | 51 | ||
51 | #include <linux/kmsg_dump.h> | 52 | #include <linux/kmsg_dump.h> |
52 | /* Move somewhere else to avoid recompiling? */ | 53 | /* Move somewhere else to avoid recompiling? */ |
@@ -433,11 +434,12 @@ static DEFINE_MUTEX(reboot_mutex); | |||
433 | SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd, | 434 | SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd, |
434 | void __user *, arg) | 435 | void __user *, arg) |
435 | { | 436 | { |
437 | struct pid_namespace *pid_ns = task_active_pid_ns(current); | ||
436 | char buffer[256]; | 438 | char buffer[256]; |
437 | int ret = 0; | 439 | int ret = 0; |
438 | 440 | ||
439 | /* We only trust the superuser with rebooting the system. */ | 441 | /* We only trust the superuser with rebooting the system. */ |
440 | if (!capable(CAP_SYS_BOOT)) | 442 | if (!ns_capable(pid_ns->user_ns, CAP_SYS_BOOT)) |
441 | return -EPERM; | 443 | return -EPERM; |
442 | 444 | ||
443 | /* For safety, we require "magic" arguments. */ | 445 | /* For safety, we require "magic" arguments. */ |
@@ -453,7 +455,7 @@ SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd, | |||
453 | * pid_namespace, the command is handled by reboot_pid_ns() which will | 455 | * pid_namespace, the command is handled by reboot_pid_ns() which will |
454 | * call do_exit(). | 456 | * call do_exit(). |
455 | */ | 457 | */ |
456 | ret = reboot_pid_ns(task_active_pid_ns(current), cmd); | 458 | ret = reboot_pid_ns(pid_ns, cmd); |
457 | if (ret) | 459 | if (ret) |
458 | return ret; | 460 | return ret; |
459 | 461 | ||
@@ -1792,14 +1794,14 @@ SYSCALL_DEFINE1(umask, int, mask) | |||
1792 | static int prctl_set_mm_exe_file(struct mm_struct *mm, unsigned int fd) | 1794 | static int prctl_set_mm_exe_file(struct mm_struct *mm, unsigned int fd) |
1793 | { | 1795 | { |
1794 | struct fd exe; | 1796 | struct fd exe; |
1795 | struct dentry *dentry; | 1797 | struct inode *inode; |
1796 | int err; | 1798 | int err; |
1797 | 1799 | ||
1798 | exe = fdget(fd); | 1800 | exe = fdget(fd); |
1799 | if (!exe.file) | 1801 | if (!exe.file) |
1800 | return -EBADF; | 1802 | return -EBADF; |
1801 | 1803 | ||
1802 | dentry = exe.file->f_path.dentry; | 1804 | inode = file_inode(exe.file); |
1803 | 1805 | ||
1804 | /* | 1806 | /* |
1805 | * Because the original mm->exe_file points to executable file, make | 1807 | * Because the original mm->exe_file points to executable file, make |
@@ -1807,11 +1809,11 @@ static int prctl_set_mm_exe_file(struct mm_struct *mm, unsigned int fd) | |||
1807 | * overall picture. | 1809 | * overall picture. |
1808 | */ | 1810 | */ |
1809 | err = -EACCES; | 1811 | err = -EACCES; |
1810 | if (!S_ISREG(dentry->d_inode->i_mode) || | 1812 | if (!S_ISREG(inode->i_mode) || |
1811 | exe.file->f_path.mnt->mnt_flags & MNT_NOEXEC) | 1813 | exe.file->f_path.mnt->mnt_flags & MNT_NOEXEC) |
1812 | goto exit; | 1814 | goto exit; |
1813 | 1815 | ||
1814 | err = inode_permission(dentry->d_inode, MAY_EXEC); | 1816 | err = inode_permission(inode, MAY_EXEC); |
1815 | if (err) | 1817 | if (err) |
1816 | goto exit; | 1818 | goto exit; |
1817 | 1819 | ||
@@ -2012,160 +2014,159 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3, | |||
2012 | 2014 | ||
2013 | error = 0; | 2015 | error = 0; |
2014 | switch (option) { | 2016 | switch (option) { |
2015 | case PR_SET_PDEATHSIG: | 2017 | case PR_SET_PDEATHSIG: |
2016 | if (!valid_signal(arg2)) { | 2018 | if (!valid_signal(arg2)) { |
2017 | error = -EINVAL; | 2019 | error = -EINVAL; |
2018 | break; | ||
2019 | } | ||
2020 | me->pdeath_signal = arg2; | ||
2021 | break; | ||
2022 | case PR_GET_PDEATHSIG: | ||
2023 | error = put_user(me->pdeath_signal, (int __user *)arg2); | ||
2024 | break; | ||
2025 | case PR_GET_DUMPABLE: | ||
2026 | error = get_dumpable(me->mm); | ||
2027 | break; | 2020 | break; |
2028 | case PR_SET_DUMPABLE: | 2021 | } |
2029 | if (arg2 < 0 || arg2 > 1) { | 2022 | me->pdeath_signal = arg2; |
2030 | error = -EINVAL; | 2023 | break; |
2031 | break; | 2024 | case PR_GET_PDEATHSIG: |
2032 | } | 2025 | error = put_user(me->pdeath_signal, (int __user *)arg2); |
2033 | set_dumpable(me->mm, arg2); | 2026 | break; |
2027 | case PR_GET_DUMPABLE: | ||
2028 | error = get_dumpable(me->mm); | ||
2029 | break; | ||
2030 | case PR_SET_DUMPABLE: | ||
2031 | if (arg2 != SUID_DUMP_DISABLE && arg2 != SUID_DUMP_USER) { | ||
2032 | error = -EINVAL; | ||
2034 | break; | 2033 | break; |
2034 | } | ||
2035 | set_dumpable(me->mm, arg2); | ||
2036 | break; | ||
2035 | 2037 | ||
2036 | case PR_SET_UNALIGN: | 2038 | case PR_SET_UNALIGN: |
2037 | error = SET_UNALIGN_CTL(me, arg2); | 2039 | error = SET_UNALIGN_CTL(me, arg2); |
2038 | break; | 2040 | break; |
2039 | case PR_GET_UNALIGN: | 2041 | case PR_GET_UNALIGN: |
2040 | error = GET_UNALIGN_CTL(me, arg2); | 2042 | error = GET_UNALIGN_CTL(me, arg2); |
2041 | break; | 2043 | break; |
2042 | case PR_SET_FPEMU: | 2044 | case PR_SET_FPEMU: |
2043 | error = SET_FPEMU_CTL(me, arg2); | 2045 | error = SET_FPEMU_CTL(me, arg2); |
2044 | break; | 2046 | break; |
2045 | case PR_GET_FPEMU: | 2047 | case PR_GET_FPEMU: |
2046 | error = GET_FPEMU_CTL(me, arg2); | 2048 | error = GET_FPEMU_CTL(me, arg2); |
2047 | break; | 2049 | break; |
2048 | case PR_SET_FPEXC: | 2050 | case PR_SET_FPEXC: |
2049 | error = SET_FPEXC_CTL(me, arg2); | 2051 | error = SET_FPEXC_CTL(me, arg2); |
2050 | break; | 2052 | break; |
2051 | case PR_GET_FPEXC: | 2053 | case PR_GET_FPEXC: |
2052 | error = GET_FPEXC_CTL(me, arg2); | 2054 | error = GET_FPEXC_CTL(me, arg2); |
2053 | break; | 2055 | break; |
2054 | case PR_GET_TIMING: | 2056 | case PR_GET_TIMING: |
2055 | error = PR_TIMING_STATISTICAL; | 2057 | error = PR_TIMING_STATISTICAL; |
2056 | break; | 2058 | break; |
2057 | case PR_SET_TIMING: | 2059 | case PR_SET_TIMING: |
2058 | if (arg2 != PR_TIMING_STATISTICAL) | 2060 | if (arg2 != PR_TIMING_STATISTICAL) |
2059 | error = -EINVAL; | 2061 | error = -EINVAL; |
2060 | break; | 2062 | break; |
2061 | case PR_SET_NAME: | 2063 | case PR_SET_NAME: |
2062 | comm[sizeof(me->comm)-1] = 0; | 2064 | comm[sizeof(me->comm) - 1] = 0; |
2063 | if (strncpy_from_user(comm, (char __user *)arg2, | 2065 | if (strncpy_from_user(comm, (char __user *)arg2, |
2064 | sizeof(me->comm) - 1) < 0) | 2066 | sizeof(me->comm) - 1) < 0) |
2065 | return -EFAULT; | 2067 | return -EFAULT; |
2066 | set_task_comm(me, comm); | 2068 | set_task_comm(me, comm); |
2067 | proc_comm_connector(me); | 2069 | proc_comm_connector(me); |
2068 | break; | 2070 | break; |
2069 | case PR_GET_NAME: | 2071 | case PR_GET_NAME: |
2070 | get_task_comm(comm, me); | 2072 | get_task_comm(comm, me); |
2071 | if (copy_to_user((char __user *)arg2, comm, | 2073 | if (copy_to_user((char __user *)arg2, comm, sizeof(comm))) |
2072 | sizeof(comm))) | 2074 | return -EFAULT; |
2073 | return -EFAULT; | 2075 | break; |
2074 | break; | 2076 | case PR_GET_ENDIAN: |
2075 | case PR_GET_ENDIAN: | 2077 | error = GET_ENDIAN(me, arg2); |
2076 | error = GET_ENDIAN(me, arg2); | 2078 | break; |
2077 | break; | 2079 | case PR_SET_ENDIAN: |
2078 | case PR_SET_ENDIAN: | 2080 | error = SET_ENDIAN(me, arg2); |
2079 | error = SET_ENDIAN(me, arg2); | 2081 | break; |
2080 | break; | 2082 | case PR_GET_SECCOMP: |
2081 | case PR_GET_SECCOMP: | 2083 | error = prctl_get_seccomp(); |
2082 | error = prctl_get_seccomp(); | 2084 | break; |
2083 | break; | 2085 | case PR_SET_SECCOMP: |
2084 | case PR_SET_SECCOMP: | 2086 | error = prctl_set_seccomp(arg2, (char __user *)arg3); |
2085 | error = prctl_set_seccomp(arg2, (char __user *)arg3); | 2087 | break; |
2086 | break; | 2088 | case PR_GET_TSC: |
2087 | case PR_GET_TSC: | 2089 | error = GET_TSC_CTL(arg2); |
2088 | error = GET_TSC_CTL(arg2); | 2090 | break; |
2089 | break; | 2091 | case PR_SET_TSC: |
2090 | case PR_SET_TSC: | 2092 | error = SET_TSC_CTL(arg2); |
2091 | error = SET_TSC_CTL(arg2); | 2093 | break; |
2092 | break; | 2094 | case PR_TASK_PERF_EVENTS_DISABLE: |
2093 | case PR_TASK_PERF_EVENTS_DISABLE: | 2095 | error = perf_event_task_disable(); |
2094 | error = perf_event_task_disable(); | 2096 | break; |
2095 | break; | 2097 | case PR_TASK_PERF_EVENTS_ENABLE: |
2096 | case PR_TASK_PERF_EVENTS_ENABLE: | 2098 | error = perf_event_task_enable(); |
2097 | error = perf_event_task_enable(); | 2099 | break; |
2098 | break; | 2100 | case PR_GET_TIMERSLACK: |
2099 | case PR_GET_TIMERSLACK: | 2101 | error = current->timer_slack_ns; |
2100 | error = current->timer_slack_ns; | 2102 | break; |
2101 | break; | 2103 | case PR_SET_TIMERSLACK: |
2102 | case PR_SET_TIMERSLACK: | 2104 | if (arg2 <= 0) |
2103 | if (arg2 <= 0) | 2105 | current->timer_slack_ns = |
2104 | current->timer_slack_ns = | ||
2105 | current->default_timer_slack_ns; | 2106 | current->default_timer_slack_ns; |
2106 | else | 2107 | else |
2107 | current->timer_slack_ns = arg2; | 2108 | current->timer_slack_ns = arg2; |
2108 | break; | 2109 | break; |
2109 | case PR_MCE_KILL: | 2110 | case PR_MCE_KILL: |
2110 | if (arg4 | arg5) | 2111 | if (arg4 | arg5) |
2111 | return -EINVAL; | 2112 | return -EINVAL; |
2112 | switch (arg2) { | 2113 | switch (arg2) { |
2113 | case PR_MCE_KILL_CLEAR: | 2114 | case PR_MCE_KILL_CLEAR: |
2114 | if (arg3 != 0) | 2115 | if (arg3 != 0) |
2115 | return -EINVAL; | ||
2116 | current->flags &= ~PF_MCE_PROCESS; | ||
2117 | break; | ||
2118 | case PR_MCE_KILL_SET: | ||
2119 | current->flags |= PF_MCE_PROCESS; | ||
2120 | if (arg3 == PR_MCE_KILL_EARLY) | ||
2121 | current->flags |= PF_MCE_EARLY; | ||
2122 | else if (arg3 == PR_MCE_KILL_LATE) | ||
2123 | current->flags &= ~PF_MCE_EARLY; | ||
2124 | else if (arg3 == PR_MCE_KILL_DEFAULT) | ||
2125 | current->flags &= | ||
2126 | ~(PF_MCE_EARLY|PF_MCE_PROCESS); | ||
2127 | else | ||
2128 | return -EINVAL; | ||
2129 | break; | ||
2130 | default: | ||
2131 | return -EINVAL; | 2116 | return -EINVAL; |
2132 | } | 2117 | current->flags &= ~PF_MCE_PROCESS; |
2133 | break; | 2118 | break; |
2134 | case PR_MCE_KILL_GET: | 2119 | case PR_MCE_KILL_SET: |
2135 | if (arg2 | arg3 | arg4 | arg5) | 2120 | current->flags |= PF_MCE_PROCESS; |
2136 | return -EINVAL; | 2121 | if (arg3 == PR_MCE_KILL_EARLY) |
2137 | if (current->flags & PF_MCE_PROCESS) | 2122 | current->flags |= PF_MCE_EARLY; |
2138 | error = (current->flags & PF_MCE_EARLY) ? | 2123 | else if (arg3 == PR_MCE_KILL_LATE) |
2139 | PR_MCE_KILL_EARLY : PR_MCE_KILL_LATE; | 2124 | current->flags &= ~PF_MCE_EARLY; |
2125 | else if (arg3 == PR_MCE_KILL_DEFAULT) | ||
2126 | current->flags &= | ||
2127 | ~(PF_MCE_EARLY|PF_MCE_PROCESS); | ||
2140 | else | 2128 | else |
2141 | error = PR_MCE_KILL_DEFAULT; | ||
2142 | break; | ||
2143 | case PR_SET_MM: | ||
2144 | error = prctl_set_mm(arg2, arg3, arg4, arg5); | ||
2145 | break; | ||
2146 | case PR_GET_TID_ADDRESS: | ||
2147 | error = prctl_get_tid_address(me, (int __user **)arg2); | ||
2148 | break; | ||
2149 | case PR_SET_CHILD_SUBREAPER: | ||
2150 | me->signal->is_child_subreaper = !!arg2; | ||
2151 | break; | ||
2152 | case PR_GET_CHILD_SUBREAPER: | ||
2153 | error = put_user(me->signal->is_child_subreaper, | ||
2154 | (int __user *) arg2); | ||
2155 | break; | ||
2156 | case PR_SET_NO_NEW_PRIVS: | ||
2157 | if (arg2 != 1 || arg3 || arg4 || arg5) | ||
2158 | return -EINVAL; | 2129 | return -EINVAL; |
2159 | |||
2160 | current->no_new_privs = 1; | ||
2161 | break; | 2130 | break; |
2162 | case PR_GET_NO_NEW_PRIVS: | ||
2163 | if (arg2 || arg3 || arg4 || arg5) | ||
2164 | return -EINVAL; | ||
2165 | return current->no_new_privs ? 1 : 0; | ||
2166 | default: | 2131 | default: |
2167 | error = -EINVAL; | 2132 | return -EINVAL; |
2168 | break; | 2133 | } |
2134 | break; | ||
2135 | case PR_MCE_KILL_GET: | ||
2136 | if (arg2 | arg3 | arg4 | arg5) | ||
2137 | return -EINVAL; | ||
2138 | if (current->flags & PF_MCE_PROCESS) | ||
2139 | error = (current->flags & PF_MCE_EARLY) ? | ||
2140 | PR_MCE_KILL_EARLY : PR_MCE_KILL_LATE; | ||
2141 | else | ||
2142 | error = PR_MCE_KILL_DEFAULT; | ||
2143 | break; | ||
2144 | case PR_SET_MM: | ||
2145 | error = prctl_set_mm(arg2, arg3, arg4, arg5); | ||
2146 | break; | ||
2147 | case PR_GET_TID_ADDRESS: | ||
2148 | error = prctl_get_tid_address(me, (int __user **)arg2); | ||
2149 | break; | ||
2150 | case PR_SET_CHILD_SUBREAPER: | ||
2151 | me->signal->is_child_subreaper = !!arg2; | ||
2152 | break; | ||
2153 | case PR_GET_CHILD_SUBREAPER: | ||
2154 | error = put_user(me->signal->is_child_subreaper, | ||
2155 | (int __user *)arg2); | ||
2156 | break; | ||
2157 | case PR_SET_NO_NEW_PRIVS: | ||
2158 | if (arg2 != 1 || arg3 || arg4 || arg5) | ||
2159 | return -EINVAL; | ||
2160 | |||
2161 | current->no_new_privs = 1; | ||
2162 | break; | ||
2163 | case PR_GET_NO_NEW_PRIVS: | ||
2164 | if (arg2 || arg3 || arg4 || arg5) | ||
2165 | return -EINVAL; | ||
2166 | return current->no_new_privs ? 1 : 0; | ||
2167 | default: | ||
2168 | error = -EINVAL; | ||
2169 | break; | ||
2169 | } | 2170 | } |
2170 | return error; | 2171 | return error; |
2171 | } | 2172 | } |
@@ -2184,11 +2185,6 @@ SYSCALL_DEFINE3(getcpu, unsigned __user *, cpup, unsigned __user *, nodep, | |||
2184 | 2185 | ||
2185 | char poweroff_cmd[POWEROFF_CMD_PATH_LEN] = "/sbin/poweroff"; | 2186 | char poweroff_cmd[POWEROFF_CMD_PATH_LEN] = "/sbin/poweroff"; |
2186 | 2187 | ||
2187 | static void argv_cleanup(struct subprocess_info *info) | ||
2188 | { | ||
2189 | argv_free(info->argv); | ||
2190 | } | ||
2191 | |||
2192 | static int __orderly_poweroff(void) | 2188 | static int __orderly_poweroff(void) |
2193 | { | 2189 | { |
2194 | int argc; | 2190 | int argc; |
@@ -2208,9 +2204,8 @@ static int __orderly_poweroff(void) | |||
2208 | } | 2204 | } |
2209 | 2205 | ||
2210 | ret = call_usermodehelper_fns(argv[0], argv, envp, UMH_WAIT_EXEC, | 2206 | ret = call_usermodehelper_fns(argv[0], argv, envp, UMH_WAIT_EXEC, |
2211 | NULL, argv_cleanup, NULL); | 2207 | NULL, NULL, NULL); |
2212 | if (ret == -ENOMEM) | 2208 | argv_free(argv); |
2213 | argv_free(argv); | ||
2214 | 2209 | ||
2215 | return ret; | 2210 | return ret; |
2216 | } | 2211 | } |