io_uring/net: ensure async prep handlers always initialize ->done_io

[ Upstream commit f3a640cca951ef9715597e68f5363afc0f452a88 ]

If we get a request with IOSQE_ASYNC set, then we first run the prep
async handlers. But if we then fail setting it up and want to post
a CQE with -EINVAL, we use ->done_io. This was previously guarded with
REQ_F_PARTIAL_IO, and the normal setup handlers do set it up before any
potential errors, but we need to cover the async setup too.

Fixes: 9817ad85899f ("io_uring/net: remove dependency on REQ_F_PARTIAL_IO for sr->done_io")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/io_uring/net.c b/io_uring/net.c
index 099ab92cca0b70543b24fb130701694cee68de2f..dbabe0058f1cb5648a481c3ec0c6a98b1f01083a 100644 (file)
--- a/io_uring/net.c
+++ b/io_uring/net.c
@@ -311,7 +311,10 @@ int io_send_prep_async(struct io_kiocb *req)
        struct io_async_msghdr *io;
        int ret;
 
-       if (!zc->addr || req_has_async_data(req))
+       if (req_has_async_data(req))
+               return 0;
+       zc->done_io = 0;
+       if (!zc->addr)
                return 0;
        io = io_msg_alloc_async_prep(req);
        if (!io)
@@ -338,8 +341,10 @@ static int io_setup_async_addr(struct io_kiocb *req,
 
 int io_sendmsg_prep_async(struct io_kiocb *req)
 {
+       struct io_sr_msg *sr = io_kiocb_to_cmd(req, struct io_sr_msg);
        int ret;
 
+       sr->done_io = 0;
        if (!io_msg_alloc_async_prep(req))
                return -ENOMEM;
        ret = io_sendmsg_copy_hdr(req, req->async_data);
@@ -586,9 +591,11 @@ static int io_recvmsg_copy_hdr(struct io_kiocb *req,
 
 int io_recvmsg_prep_async(struct io_kiocb *req)
 {
+       struct io_sr_msg *sr = io_kiocb_to_cmd(req, struct io_sr_msg);
        struct io_async_msghdr *iomsg;
        int ret;
 
+       sr->done_io = 0;
        if (!io_msg_alloc_async_prep(req))
                return -ENOMEM;
        iomsg = req->async_data;