github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-29 17:43:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

io_uring: add validate_fixed_range() for validate fixed buffer

Browse Source 
Add helper of validate_fixed_range() for validating fixed buffer
range.

Signed-off-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Caleb Sander Mateos <csander@purestorage.com>
Link: https://lore.kernel.org/r/20250325135155.935398-2-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Ming Lei 2025-03-25 21:51:50 +08:00 committed by Jens Axboe
parent f8554f512b
commit 8622b20f23
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
io_uring/rsrc.c
View File

@ -1002,15 +1002,11 @@ int io_buffer_unregister_bvec(struct io_uring_cmd *cmd, unsigned int index,
} }
EXPORT_SYMBOL_GPL(io_buffer_unregister_bvec); EXPORT_SYMBOL_GPL(io_buffer_unregister_bvec);
static int io_import_fixed(int ddir, struct iov_iter *iter, static int validate_fixed_range(u64 buf_addr, size_t len,
struct io_mapped_ubuf *imu, const struct io_mapped_ubuf *imu)
u64 buf_addr, size_t len)
{ {
u64 buf_end; u64 buf_end;
size_t offset;
if (WARN_ON_ONCE(!imu))
return -EFAULT;
if (unlikely(check_add_overflow(buf_addr, (u64)len, &buf_end))) if (unlikely(check_add_overflow(buf_addr, (u64)len, &buf_end)))
return -EFAULT; return -EFAULT;
/* not inside the mapped region */ /* not inside the mapped region */
@ -1018,6 +1014,21 @@ static int io_import_fixed(int ddir, struct iov_iter *iter,
return -EFAULT; return -EFAULT;
if (unlikely(len > MAX_RW_COUNT)) if (unlikely(len > MAX_RW_COUNT))
return -EFAULT; return -EFAULT;
return 0;
}
static int io_import_fixed(int ddir, struct iov_iter *iter,
struct io_mapped_ubuf *imu,
u64 buf_addr, size_t len)
{
size_t offset;
int ret;
if (WARN_ON_ONCE(!imu))
return -EFAULT;
ret = validate_fixed_range(buf_addr, len, imu);
if (unlikely(ret))
return ret;
if (!(imu->dir & (1 << ddir))) if (!(imu->dir & (1 << ddir)))
return -EFAULT; return -EFAULT;
@ -1307,12 +1318,12 @@ static int io_vec_fill_bvec(int ddir, struct iov_iter *iter,
u64 buf_addr = (u64)(uintptr_t)iovec[iov_idx].iov_base; u64 buf_addr = (u64)(uintptr_t)iovec[iov_idx].iov_base;
struct bio_vec *src_bvec; struct bio_vec *src_bvec;
size_t offset; size_t offset;
u64 buf_end; int ret;
ret = validate_fixed_range(buf_addr, iov_len, imu);
if (unlikely(ret))
return ret;
if (unlikely(check_add_overflow(buf_addr, (u64)iov_len, &buf_end)))
return -EFAULT;
if (unlikely(buf_addr < imu->ubuf || buf_end > (imu->ubuf + imu->len)))
return -EFAULT;
if (unlikely(!iov_len)) if (unlikely(!iov_len))
return -EFAULT; return -EFAULT;
if (unlikely(check_add_overflow(total_len, iov_len, &total_len))) if (unlikely(check_add_overflow(total_len, iov_len, &total_len)))