2021-11-29 04:05:39

by yebin (H)

Subject: [PATCH -next] io_uring: Fix undefined-behaviour in io_issue_sqe if pass large timeout value when call io_timeout_remove_prep

This patch fix another scene lead to the issue which
"io_uring: Fix undefined-behaviour in io_issue_sqe" commit descript.
Add check if timeout is legal which user space pass in when call
io_timeout_remove_prep to update timeout value.

Signed-off-by: Ye Bin <[email protected]>
---
fs/io_uring.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 39fd7372b324..de913334f22e 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -6114,6 +6114,8 @@ static int io_timeout_remove_prep(struct io_kiocb *req,
return -EINVAL;
if (get_timespec64(&tr->ts, u64_to_user_ptr(sqe->addr2)))
return -EFAULT;
+ if (tr->ts.tv_sec < 0 || tr->ts.tv_nsec < 0)
+ return -EINVAL;
} else if (tr->flags) {
/* timeout removal doesn't support flags */
return -EINVAL;
--
2.31.1

2021-11-29 15:42:05

by Jens Axboe

Subject: Re: [PATCH -next] io_uring: Fix undefined-behaviour in io_issue_sqe if pass large timeout value when call io_timeout_remove_prep

On Mon, 29 Nov 2021 12:15:37 +0800, Ye Bin wrote:
> This patch fix another scene lead to the issue which
> "io_uring: Fix undefined-behaviour in io_issue_sqe" commit descript.
> Add check if timeout is legal which user space pass in when call
> io_timeout_remove_prep to update timeout value.
>
>

Applied, thanks!

[1/1] io_uring: Fix undefined-behaviour in io_issue_sqe if pass large timeout value when call io_timeout_remove_prep
commit: 2087009c74d41ab8579f08157bca55b7d0857ee5

Best regards,
--
Jens Axboe