Merge tag 'io_uring-5.8-2020-07-12' of git://git.kernel.dk/linux-block

Pull io_uring fixes from Jens Axboe:
"Two late fixes again:

- Fix missing msg_name assignment in certain cases (Pavel)

- Correct a previous fix for full coverage (Pavel)"

* tag 'io_uring-5.8-2020-07-12' of git://git.kernel.dk/linux-block:
io_uring: fix not initialised work->flags
io_uring: fix missing msg_name assignment

Changed files
+4 -1
fs
+4 -1
fs/io_uring.c
··· 1096 1096 { 1097 1097 const struct io_op_def *def = &io_op_defs[req->opcode]; 1098 1098 1099 + io_req_init_async(req); 1100 + 1099 1101 if (req->flags & REQ_F_ISREG) { 1100 1102 if (def->hash_reg_file) 1101 1103 io_wq_hash_work(&req->work, file_inode(req->file)); ··· 1106 1104 req->work.flags |= IO_WQ_WORK_UNBOUND; 1107 1105 } 1108 1106 1109 - io_req_init_async(req); 1110 1107 io_req_work_grab_env(req, def); 1111 1108 1112 1109 *link = io_prep_linked_timeout(req); ··· 3554 3553 if (req->flags & REQ_F_NEED_CLEANUP) 3555 3554 return 0; 3556 3555 3556 + io->msg.msg.msg_name = &io->msg.addr; 3557 3557 io->msg.iov = io->msg.fast_iov; 3558 3558 ret = sendmsg_copy_msghdr(&io->msg.msg, sr->msg, sr->msg_flags, 3559 3559 &io->msg.iov); ··· 3736 3734 3737 3735 static int io_recvmsg_copy_hdr(struct io_kiocb *req, struct io_async_ctx *io) 3738 3736 { 3737 + io->msg.msg.msg_name = &io->msg.addr; 3739 3738 io->msg.iov = io->msg.fast_iov; 3740 3739 3741 3740 #ifdef CONFIG_COMPAT