On Mon, Jun 27, 2022 at 8:20 PM Sasha Levin <sashal@xxxxxxxxxx> wrote: > > From: Jens Axboe <axboe@xxxxxxxxx> > > [ Upstream commit b60cac14bb3c88cff2a7088d9095b01a80938c41 ] > > With the dropping of the IOPOLL checking in the per-opcode handlers, > we inadvertently left two checks in the recv/recvmsg and send/sendmsg > prep handlers for the same thing, and one of them includes addr2 which > holds the flags for these opcodes. > > Fix it up and kill the redundant checks. > > Signed-off-by: Jens Axboe <axboe@xxxxxxxxx> > Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> > --- > fs/io_uring.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/fs/io_uring.c b/fs/io_uring.c > index 725c59c734f1..9eb20f8865ac 100644 > --- a/fs/io_uring.c > +++ b/fs/io_uring.c > @@ -5252,8 +5252,6 @@ static int io_sendmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) > > if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL)) > return -EINVAL; > - if (unlikely(sqe->addr2 || sqe->file_index)) > - return -EINVAL; > > sr->umsg = u64_to_user_ptr(READ_ONCE(sqe->addr)); > sr->len = READ_ONCE(sqe->len); > @@ -5465,8 +5463,6 @@ static int io_recvmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) > > if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL)) > return -EINVAL; > - if (unlikely(sqe->addr2 || sqe->file_index)) > - return -EINVAL; > > sr->umsg = u64_to_user_ptr(READ_ONCE(sqe->addr)); > sr->len = READ_ONCE(sqe->len); This doesn't look right, and cannot be as the problem was added with a 5.19 merge issue. Please drop this patch from 5.18-stable, thanks. -- Jens Axboe
