Skip to content

Commit 155740c

Browse files
isilencegregkh
authored andcommitted
io_uring/kbuf: use mem_is_zero()
commit 1724849 upstream. Make use of mem_is_zero() for reserved fields checking. Signed-off-by: Pavel Begunkov <asml.silence@gmail.com> Link: https://lore.kernel.org/r/11fe27b7a831329bcdb4ea087317ef123ba7c171.1747150490.git.asml.silence@gmail.com Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 2538fbe commit 155740c

1 file changed

Lines changed: 4 additions & 10 deletions

File tree

io_uring/kbuf.c

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -705,8 +705,7 @@ int io_register_pbuf_ring(struct io_ring_ctx *ctx, void __user *arg)
705705

706706
if (copy_from_user(&reg, arg, sizeof(reg)))
707707
return -EFAULT;
708-
709-
if (reg.resv[0] || reg.resv[1] || reg.resv[2])
708+
if (!mem_is_zero(reg.resv, sizeof(reg.resv)))
710709
return -EINVAL;
711710
if (reg.flags & ~(IOU_PBUF_RING_MMAP | IOU_PBUF_RING_INC))
712711
return -EINVAL;
@@ -773,9 +772,7 @@ int io_unregister_pbuf_ring(struct io_ring_ctx *ctx, void __user *arg)
773772

774773
if (copy_from_user(&reg, arg, sizeof(reg)))
775774
return -EFAULT;
776-
if (reg.resv[0] || reg.resv[1] || reg.resv[2])
777-
return -EINVAL;
778-
if (reg.flags)
775+
if (!mem_is_zero(reg.resv, sizeof(reg.resv)) || reg.flags)
779776
return -EINVAL;
780777

781778
bl = io_buffer_get_list(ctx, reg.bgid);
@@ -793,14 +790,11 @@ int io_register_pbuf_status(struct io_ring_ctx *ctx, void __user *arg)
793790
{
794791
struct io_uring_buf_status buf_status;
795792
struct io_buffer_list *bl;
796-
int i;
797793

798794
if (copy_from_user(&buf_status, arg, sizeof(buf_status)))
799795
return -EFAULT;
800-
801-
for (i = 0; i < ARRAY_SIZE(buf_status.resv); i++)
802-
if (buf_status.resv[i])
803-
return -EINVAL;
796+
if (!mem_is_zero(buf_status.resv, sizeof(buf_status.resv)))
797+
return -EINVAL;
804798

805799
bl = io_buffer_get_list(ctx, buf_status.buf_group);
806800
if (!bl)

0 commit comments

Comments
 (0)