io_uring: use timespec64_valid() to verify time value
PATCH 1/1 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(-)
fs/io_uring.c +2 -2
@@ -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);
Signature · 1 line
2.31.1
Quoted 23 lines · Ye Bin
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(-)fs/io_uring.c +1
-1@@ -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 */
fs/io_uring.c static int io_timeout_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe, · line 6244
Quoted 8 lines
fs/io_uring.c +1
-1@@ -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...
ping...
Quoted 31 lines · Ye Bin
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(-)fs/io_uring.c +2
-2@@ -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);
Quoted 6 lines · Ye Bin
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.