From: Dylan Yudaken <dylany@fb.com>
Date: Tue, 12 Apr 2022 16:30:42 +0000 (-0700)
Subject: io_uring: verify pad field is 0 in io_get_ext_arg
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9947548d9cef58f6be28b7bb0be53138626ff319;p=linux.git

io_uring: verify pad field is 0 in io_get_ext_arg

[ Upstream commit d2347b9695dafe5c388a5f9aeb70e27a7a4d29cf ]

Ensure that only 0 is passed for pad here.

Fixes: c73ebb685fb6 ("io_uring: add timeout support for io_uring_enter()")
Signed-off-by: Dylan Yudaken <dylany@fb.com>
Link: https://lore.kernel.org/r/20220412163042.2788062-5-dylany@fb.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 66671c0bd8646..cc0a07a9fe9cf 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -9981,6 +9981,8 @@ static int io_get_ext_arg(unsigned flags, const void __user *argp, size_t *argsz
 		return -EINVAL;
 	if (copy_from_user(&arg, argp, sizeof(arg)))
 		return -EFAULT;
+	if (arg.pad)
+		return -EINVAL;
 	*sig = u64_to_user_ptr(arg.sigmask);
 	*argsz = arg.sigmask_sz;
 	*ts = u64_to_user_ptr(arg.ts);