io_uring: correct check for O_TMPFILE

cyphar · axboe · commit 72dbde0f2afb · 2023-08-07T12:34:23.000-06:00
O_TMPFILE is actually __O_TMPFILE|O_DIRECTORY. This means that the old check for whether RESOLVE_CACHED can be used would incorrectly think that O_DIRECTORY could not be used with RESOLVE_CACHED. Cc: stable@vger.kernel.org # v5.12+ Fixes: 3a81fd0 ("io_uring: enable LOOKUP_CACHED path resolution for filename lookups") Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> Link: https://lore.kernel.org/r/20230807-resolve_cached-o_tmpfile-v3-1-e49323e1ef6f@cyphar.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/io_uring/openclose.c b/io_uring/openclose.c
@@ -35,9 +35,11 @@ static bool io_openat_force_async(struct io_open *open)
 {
 	/*
 	 * Don't bother trying for O_TRUNC, O_CREAT, or O_TMPFILE open,
-	 * it'll always -EAGAIN
+	 * it'll always -EAGAIN. Note that we test for __O_TMPFILE because
+	 * O_TMPFILE includes O_DIRECTORY, which isn't a flag we need to force
+	 * async for.
 	 */
-	return open->how.flags & (O_TRUNC | O_CREAT | O_TMPFILE);
+	return open->how.flags & (O_TRUNC | O_CREAT | __O_TMPFILE);
 }
 
 static int __io_openat_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)

Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,11 @@ static bool io_openat_force_async(struct io_open *open)`
`35`	`35`	`{`
`36`	`36`	`/*`
`37`	`37`	`* Don't bother trying for O_TRUNC, O_CREAT, or O_TMPFILE open,`
`38`		`- * it'll always -EAGAIN`
	`38`	`+ * it'll always -EAGAIN. Note that we test for __O_TMPFILE because`
	`39`	`+ * O_TMPFILE includes O_DIRECTORY, which isn't a flag we need to force`
	`40`	`+ * async for.`
`39`	`41`	`*/`
`40`		`- return open->how.flags & (O_TRUNC \| O_CREAT \| O_TMPFILE);`
	`42`	`+ return open->how.flags & (O_TRUNC \| O_CREAT \| __O_TMPFILE);`
`41`	`43`	`}`
`42`	`44`
`43`	`45`	`static int __io_openat_prep(struct io_kiocb req, const struct io_uring_sqe sqe)`