[PATCH] kernel/exit.c: avoid undefined behaviour when calling wait4()
Colin King
colin.king at canonical.com
Thu Jul 19 08:37:56 UTC 2018
From: zhongjiang <zhongjiang at huawei.com>
CVE-2018-10087
wait4(-2147483648, 0x20, 0, 0xdd0000) triggers:
UBSAN: Undefined behaviour in kernel/exit.c:1651:9
The related calltrace is as follows:
negation of -2147483648 cannot be represented in type 'int':
CPU: 9 PID: 16482 Comm: zj Tainted: G B ---- ------- 3.10.0-327.53.58.71.x86_64+ #66
Hardware name: Huawei Technologies Co., Ltd. Tecal RH2285 /BC11BTSA , BIOS CTSAV036 04/27/2011
Call Trace:
dump_stack+0x19/0x1b
ubsan_epilogue+0xd/0x50
__ubsan_handle_negate_overflow+0x109/0x14e
SyS_wait4+0x1cb/0x1e0
system_call_fastpath+0x16/0x1b
Exclude the overflow to avoid the UBSAN warning.
Link: http://lkml.kernel.org/r/1497264618-20212-1-git-send-email-zhongjiang@huawei.com
Signed-off-by: zhongjiang <zhongjiang at huawei.com>
Cc: Oleg Nesterov <oleg at redhat.com>
Cc: David Rientjes <rientjes at google.com>
Cc: Aneesh Kumar K.V <aneesh.kumar at linux.vnet.ibm.com>
Cc: Kirill A. Shutemov <kirill.shutemov at linux.intel.com>
Cc: Xishi Qiu <qiuxishi at huawei.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
(cherry picked from upstream commit dd83c161fbcc5d8be637ab159c0de015cbff5ba4)
Signed-off-by: Colin Ian King <colin.king at canonical.com>
---
kernel/exit.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/kernel/exit.c b/kernel/exit.c
index 81b3d67..9edcf2d 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -1639,6 +1639,10 @@ SYSCALL_DEFINE4(wait4, pid_t, upid, int __user *, stat_addr,
__WNOTHREAD|__WCLONE|__WALL))
return -EINVAL;
+ /* -INT_MIN is not defined */
+ if (upid == INT_MIN)
+ return -ESRCH;
+
if (upid == -1)
type = PIDTYPE_MAX;
else if (upid < 0) {
--
2.7.4
More information about the kernel-team
mailing list