Skip to content

Commit 0b7b21e

Browse files
committed
io_uring: use the proper helpers for io_send/recv
Don't use the recvmsg/sendmsg helpers, use the same helpers that the recv(2) and send(2) system calls use. Reported-by: 李通洲 <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
1 parent f0b493e commit 0b7b21e

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

fs/io_uring.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3090,7 +3090,8 @@ static int io_send(struct io_kiocb *req, struct io_kiocb **nxt,
30903090
else if (force_nonblock)
30913091
flags |= MSG_DONTWAIT;
30923092

3093-
ret = __sys_sendmsg_sock(sock, &msg, flags);
3093+
msg.msg_flags = flags;
3094+
ret = sock_sendmsg(sock, &msg);
30943095
if (force_nonblock && ret == -EAGAIN)
30953096
return -EAGAIN;
30963097
if (ret == -ERESTARTSYS)
@@ -3116,6 +3117,7 @@ static int io_recvmsg_prep(struct io_kiocb *req,
31163117

31173118
sr->msg_flags = READ_ONCE(sqe->msg_flags);
31183119
sr->msg = u64_to_user_ptr(READ_ONCE(sqe->addr));
3120+
sr->len = READ_ONCE(sqe->len);
31193121

31203122
if (!io || req->opcode == IORING_OP_RECV)
31213123
return 0;
@@ -3234,7 +3236,7 @@ static int io_recv(struct io_kiocb *req, struct io_kiocb **nxt,
32343236
else if (force_nonblock)
32353237
flags |= MSG_DONTWAIT;
32363238

3237-
ret = __sys_recvmsg_sock(sock, &msg, NULL, NULL, flags);
3239+
ret = sock_recvmsg(sock, &msg, flags);
32383240
if (force_nonblock && ret == -EAGAIN)
32393241
return -EAGAIN;
32403242
if (ret == -ERESTARTSYS)

0 commit comments

Comments
 (0)