Merge tag 'for_v5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[linux-2.6-microblaze.git] / fs / open.c

diff --git a/fs/open.c b/fs/open.c
index 581a674..1e06e44 100644 (file)
--- a/fs/open.c
+++ b/fs/open.c
@@ -1010,6 +1010,10 @@ inline int build_open_flags(const struct open_how *how, struct open_flags *op)
        if (how->resolve & ~VALID_RESOLVE_FLAGS)
                return -EINVAL;
 
+       /* Scoping flags are mutually exclusive. */
+       if ((how->resolve & RESOLVE_BENEATH) && (how->resolve & RESOLVE_IN_ROOT))
+               return -EINVAL;
+
        /* Deal with the mode. */
        if (WILL_CREATE(flags)) {
                if (how->mode & ~S_IALLUGO)