UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

io_uring: free iovec if file assignment fails 

We just return failure in this case, but we need to release the iovec
first. If we're doing IO with more than FAST_IOV segments, then the
iovec is allocated and must be freed.

Reported-by: syzbot+96b43810dfe9c3bb95ed@syzkaller.appspotmail.com
Fixes: 584b0180f0 ("io_uring: move read/write file prep state into actual opcode handler")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jens Axboe 2022-04-16 21:14:00 -06:00
parent 701521403c
commit 323b190ba2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/io_uring.c
View File

@ -3832,8 +3832,10 @@ static int io_read(struct io_kiocb *req, unsigned int issue_flags)
iovec = NULL; iovec = NULL;
} }
ret = io_rw_init_file(req, FMODE_READ); ret = io_rw_init_file(req, FMODE_READ);
if (unlikely(ret)) if (unlikely(ret)) {
kfree(iovec);
return ret; return ret;
}
req->result = iov_iter_count(&s->iter); req->result = iov_iter_count(&s->iter);
if (force_nonblock) { if (force_nonblock) {
@ -3958,8 +3960,10 @@ static int io_write(struct io_kiocb *req, unsigned int issue_flags)
iovec = NULL; iovec = NULL;
} }
ret = io_rw_init_file(req, FMODE_WRITE); ret = io_rw_init_file(req, FMODE_WRITE);
if (unlikely(ret)) if (unlikely(ret)) {
kfree(iovec);
return ret; return ret;
}
req->result = iov_iter_count(&s->iter); req->result = iov_iter_count(&s->iter);
if (force_nonblock) { if (force_nonblock) {