io_uring: flags-based creds init in queue
authorPavel Begunkov <asml.silence@gmail.com>
Sun, 18 Oct 2020 09:17:37 +0000 (10:17 +0100)
committerJens Axboe <axboe@kernel.dk>
Mon, 19 Oct 2020 19:29:29 +0000 (13:29 -0600)
Use IO_WQ_WORK_CREDS to figure out if req has creds to be used.
Since recently it should rely only on flags, but not value of
work.creds.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
fs/io_uring.c

index 0f4a9c4..e9e8006 100644 (file)
@@ -6191,7 +6191,8 @@ static void __io_queue_sqe(struct io_kiocb *req, struct io_comp_state *cs)
 again:
        linked_timeout = io_prep_linked_timeout(req);
 
 again:
        linked_timeout = io_prep_linked_timeout(req);
 
-       if ((req->flags & REQ_F_WORK_INITIALIZED) && req->work.identity->creds &&
+       if ((req->flags & REQ_F_WORK_INITIALIZED) &&
+           (req->work.flags & IO_WQ_WORK_CREDS) &&
            req->work.identity->creds != current_cred()) {
                if (old_creds)
                        revert_creds(old_creds);
            req->work.identity->creds != current_cred()) {
                if (old_creds)
                        revert_creds(old_creds);
@@ -6199,7 +6200,6 @@ again:
                        old_creds = NULL; /* restored original creds */
                else
                        old_creds = override_creds(req->work.identity->creds);
                        old_creds = NULL; /* restored original creds */
                else
                        old_creds = override_creds(req->work.identity->creds);
-               req->work.flags |= IO_WQ_WORK_CREDS;
        }
 
        ret = io_issue_sqe(req, true, cs);
        }
 
        ret = io_issue_sqe(req, true, cs);