diff options
| author | Aleksa Sarai <cyphar@cyphar.com> | 2023-08-06 02:11:58 +1000 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2023-08-06 15:08:35 +0200 |
| commit | a0fc452a5d7fed986205539259df1d60546f536c (patch) | |
| tree | 020cfc21ca401802c599f000db6d8757e01c7f5e | |
| parent | 024ff300db33968c133435a146d51ac22db27374 (diff) | |
| download | lwn-a0fc452a5d7fed986205539259df1d60546f536c.tar.gz lwn-a0fc452a5d7fed986205539259df1d60546f536c.zip | |
open: make RESOLVE_CACHED correctly test for O_TMPFILE
O_TMPFILE is actually __O_TMPFILE|O_DIRECTORY. This means that the old
fast-path check for RESOLVE_CACHED would reject all users passing
O_DIRECTORY with -EAGAIN, when in fact the intended test was to check
for __O_TMPFILE.
Cc: stable@vger.kernel.org # v5.12+
Fixes: 99668f618062 ("fs: expose LOOKUP_CACHED through openat2() RESOLVE_CACHED")
Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
Message-Id: <20230806-resolve_cached-o_tmpfile-v1-1-7ba16308465e@cyphar.com>
Signed-off-by: Christian Brauner <brauner@kernel.org>
| -rw-r--r-- | fs/open.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/open.c b/fs/open.c index 0c55c8e7f837..e6ead0f19964 100644 --- a/fs/open.c +++ b/fs/open.c @@ -1322,7 +1322,7 @@ inline int build_open_flags(const struct open_how *how, struct open_flags *op) lookup_flags |= LOOKUP_IN_ROOT; if (how->resolve & RESOLVE_CACHED) { /* Don't bother even trying for create/truncate/tmpfile open */ - if (flags & (O_TRUNC | O_CREAT | O_TMPFILE)) + if (flags & (O_TRUNC | O_CREAT | __O_TMPFILE)) return -EAGAIN; lookup_flags |= LOOKUP_CACHED; } |