2021-12-02 06:37:49

by Ye Bin

Subject: [PATCH -next] io_uring: use timespec64_valid() to verify time value

It's better to use timespec64_valid() to verify time value.

Fixes: 2087009c74d4("io_uring: validate timespec for timeout removals")
Fixes: f6223ff79966("io_uring: Fix undefined-behaviour in io_issue_sqe")
Signed-off-by: Ye Bin <[email protected]>
---
fs/io_uring.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 568729677e25..929ff732d6dc 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -6151,7 +6151,7 @@ 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)
+ if (!timespec64_valid(&tr->ts))
return -EINVAL;
} else if (tr->flags) {
/* timeout removal doesn't support flags */
@@ -6238,7 +6238,7 @@ static int io_timeout_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe,
if (get_timespec64(&data->ts, u64_to_user_ptr(sqe->addr)))
return -EFAULT;

- if (data->ts.tv_sec < 0 || data->ts.tv_nsec < 0)
+ if (!timespec64_valid(&data->ts))
return -EINVAL;

data->mode = io_translate_timeout_mode(flags);
--
2.31.1

2021-12-09 02:15:57

by Ye Bin

Subject: Re: [PATCH -next] io_uring: use timespec64_valid() to verify time value

On 2021/12/2 14:49, Ye Bin wrote:
> It's better to use timespec64_valid() to verify time value.
>
> Fixes: 2087009c74d4("io_uring: validate timespec for timeout removals")
> Fixes: f6223ff79966("io_uring: Fix undefined-behaviour in io_issue_sqe")
> Signed-off-by: Ye Bin <[email protected]>
> ---
> fs/io_uring.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/io_uring.c b/fs/io_uring.c
> index 568729677e25..929ff732d6dc 100644
> --- a/fs/io_uring.c
> +++ b/fs/io_uring.c
> @@ -6151,7 +6151,7 @@ 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)
> + if (!timespec64_valid(&tr->ts))
> return -EINVAL;
> } else if (tr->flags) {
> /* timeout removal doesn't support flags */
> @@ -6238,7 +6238,7 @@ static int io_timeout_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe,
> if (get_timespec64(&data->ts, u64_to_user_ptr(sqe->addr)))
> return -EFAULT;
>
> - if (data->ts.tv_sec < 0 || data->ts.tv_nsec < 0)
> + if (!timespec64_valid(&data->ts))
> return -EINVAL;
>
> data->mode = io_translate_timeout_mode(flags);
ping...

2021-12-16 13:15:17

by Ye Bin

Subject: Re: [PATCH -next] io_uring: use timespec64_valid() to verify time value

ping...

On 2021/12/2 14:49, Ye Bin wrote:
> It's better to use timespec64_valid() to verify time value.
>
> Fixes: 2087009c74d4("io_uring: validate timespec for timeout removals")
> Fixes: f6223ff79966("io_uring: Fix undefined-behaviour in io_issue_sqe")
> Signed-off-by: Ye Bin <[email protected]>
> ---
> fs/io_uring.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/io_uring.c b/fs/io_uring.c
> index 568729677e25..929ff732d6dc 100644
> --- a/fs/io_uring.c
> +++ b/fs/io_uring.c
> @@ -6151,7 +6151,7 @@ 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)
> + if (!timespec64_valid(&tr->ts))
> return -EINVAL;
> } else if (tr->flags) {
> /* timeout removal doesn't support flags */
> @@ -6238,7 +6238,7 @@ static int io_timeout_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe,
> if (get_timespec64(&data->ts, u64_to_user_ptr(sqe->addr)))
> return -EFAULT;
>
> - if (data->ts.tv_sec < 0 || data->ts.tv_nsec < 0)
> + if (!timespec64_valid(&data->ts))
> return -EINVAL;
>
> data->mode = io_translate_timeout_mode(flags);

2021-12-16 15:08:12

by Muchun Song

Subject: Re: [PATCH -next] io_uring: use timespec64_valid() to verify time value

On Thu, Dec 2, 2021 at 2:37 PM Ye Bin <[email protected]> wrote:
>
> It's better to use timespec64_valid() to verify time value.
>
> Fixes: 2087009c74d4("io_uring: validate timespec for timeout removals")
> Fixes: f6223ff79966("io_uring: Fix undefined-behaviour in io_issue_sqe")
> Signed-off-by: Ye Bin <[email protected]>

Reviewed-by: Muchun Song <[email protected]>

Thanks.