io_uring: fix recvmsg memory leak with buffer selection

681fda8d · Pavel Begunkov <[email protected]> · 2020-07-15 22:20:45 +03:00

io_recvmsg() doesn't free memory allocated for struct io_buffer. This can
causes a leak when used with automatic buffer selection.

Signed-off-by: Pavel Begunkov <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>

Commit: 681fda8d27a66f7e65ff7f2d200d7635e64a8d05
Parents: 16d59803

Changes

1 files changed · +8 −2

File	Status	Add	Del	Content
fs/io_uring.c	modified	+8	−2	View file

fs/io_uring.c

View file

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 9fd7e69..74bc4a0 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -3845,10 +3845,16 @@ static int io_recvmsg(struct io_kiocb *req, bool force_nonblock)
 
 		ret = __sys_recvmsg_sock(sock, &kmsg->msg, req->sr_msg.msg,
 						kmsg->uaddr, flags);
-		if (force_nonblock && ret == -EAGAIN)
-			return io_setup_async_msg(req, kmsg);
+		if (force_nonblock && ret == -EAGAIN) {
+			ret = io_setup_async_msg(req, kmsg);
+			if (ret != -EAGAIN)
+				kfree(kbuf);
+			return ret;
+		}
 		if (ret == -ERESTARTSYS)
 			ret = -EINTR;
+		if (kbuf)
+			kfree(kbuf);
 	}
 
 	if (kmsg && kmsg->iov != kmsg->fast_iov)