]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
fanotify_user: use upper_32_bits() to verify mask
authorChristian Brauner <christian.brauner@ubuntu.com>
Thu, 25 Mar 2021 08:37:43 +0000 (09:37 +0100)
committerJan Kara <jack@suse.cz>
Thu, 25 Mar 2021 14:33:45 +0000 (15:33 +0100)
I don't see an obvious reason why the upper 32 bit check needs to be
open-coded this way. Switch to upper_32_bits() which is more idiomatic and
should conceptually be the same check.

Cc: Amir Goldstein <amir73il@gmail.com>
Cc: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20210325083742.2334933-1-brauner@kernel.org
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: Jan Kara <jack@suse.cz>
fs/notify/fanotify/fanotify_user.c

index 65142b1fa8232937e2a81c503729d55a9e826239..71fefb30e015669259a3a4ed2ce759a715ae7740 100644 (file)
@@ -1250,7 +1250,7 @@ static int do_fanotify_mark(int fanotify_fd, unsigned int flags, __u64 mask,
                 __func__, fanotify_fd, flags, dfd, pathname, mask);
 
        /* we only use the lower 32 bits as of right now. */
-       if (mask & ((__u64)0xffffffff << 32))
+       if (upper_32_bits(mask))
                return -EINVAL;
 
        if (flags & ~FANOTIFY_MARK_FLAGS)