[PATCH] io_uring: add cleanup for openat()

[PATCH] io_uring: add cleanup for openat()

[Pavel Begunkov]

openat() have allocated ->open.filename, which need to be put.
Add cleanup handlers for it.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
---
 fs/io_uring.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/fs/io_uring.c b/fs/io_uring.c
index b0e6b3bc1aec..42b7861b534c 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -2547,6 +2547,7 @@ static int io_openat_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
 		return ret;
 	}
 
+	req->flags |= REQ_F_NEED_CLEANUP;
 	return 0;
 }
 
@@ -2585,6 +2586,7 @@ static int io_openat2_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
 		return ret;
 	}
 
+	req->flags |= REQ_F_NEED_CLEANUP;
 	return 0;
 }
 
@@ -2616,6 +2618,7 @@ static int io_openat2(struct io_kiocb *req, struct io_kiocb **nxt,
 	}
 err:
 	putname(req->open.filename);
+	req->flags &= ~REQ_F_NEED_CLEANUP;
 	if (ret < 0)
 		req_set_fail_links(req);
 	io_cqring_add_event(req, ret);
@@ -2857,7 +2860,6 @@ static void io_close_finish(struct io_wq_work **workptr)
 	}
 
 	fput(req->close.put_file);
-
 	io_put_req_find_next(req, &nxt);
 	if (nxt)
 		io_wq_assign_next(workptr, nxt);
@@ -4233,6 +4235,10 @@ static void io_cleanup_req(struct io_kiocb *req)
 		if (io->msg.iov != io->msg.fast_iov)
 			kfree(io->msg.iov);
 		break;
+	case IORING_OP_OPENAT:
+	case IORING_OP_OPENAT2:
+		putname(req->open.filename);
+		break;
 	}
 
 	req->flags &= ~REQ_F_NEED_CLEANUP;
-- 
2.24.0

Re: [PATCH] io_uring: add cleanup for openat()

[Jens Axboe]

On 2/7/20 1:45 PM, Pavel Begunkov wrote:
> openat() have allocated ->open.filename, which need to be put.
> Add cleanup handlers for it.

Should this include statx too?

-- 
Jens Axboe

Re: [PATCH] io_uring: add cleanup for openat()

[Pavel Begunkov]

[-- Attachment #1.1: Type: text/plain, Size: 316 bytes --]

On 07/02/2020 23:53, Jens Axboe wrote:
> On 2/7/20 1:45 PM, Pavel Begunkov wrote:
>> openat() have allocated ->open.filename, which need to be put.
>> Add cleanup handlers for it.
> 
> Should this include statx too?

It should. Missed, that statx uses the same struct.
I'll resend.

-- 
Pavel Begunkov


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]