path: root/fs/open.c
diff options
authorAl Viro <>2020-01-08 20:19:38 -0500
committerAl Viro <>2020-02-27 14:43:56 -0500
commit31d1726d7250021c66c9f16d8a128444676db782 (patch)
tree01cefcb0dbfb2a3a5dfd95cb8871aa802fadfbd7 /fs/open.c
parent1c9f5e06a613cc48608db1a4207b8bd5ebe70a81 (diff)
make build_open_flags() treat O_CREAT | O_EXCL as implying O_NOFOLLOW
O_CREAT | O_EXCL means "-EEXIST if we run into a trailing symlink". As it is, we might or might not have LOOKUP_FOLLOW in op->intent in that case - that depends upon having O_NOFOLLOW in open flags. It doesn't matter, since we won't be checking it in that case - do_last() bails out earlier. However, making sure it's not set (i.e. acting as if we had an explicit O_NOFOLLOW) makes the behaviour more explicit and allows to reorder the check for O_CREAT | O_EXCL in do_last() with the call of step_into() immediately following it. Signed-off-by: Al Viro <>
Diffstat (limited to 'fs/open.c')
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/open.c b/fs/open.c
index 0788b3715731..e5227cd533f4 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -1049,8 +1049,10 @@ inline int build_open_flags(const struct open_how *how, struct open_flags *op)
if (flags & O_CREAT) {
op->intent |= LOOKUP_CREATE;
- if (flags & O_EXCL)
+ if (flags & O_EXCL) {
op->intent |= LOOKUP_EXCL;
+ flags |= O_NOFOLLOW;
+ }
if (flags & O_DIRECTORY)