From: Christian Brauner Date: Thu, 25 Mar 2021 08:37:43 +0000 (+0100) Subject: fanotify_user: use upper_32_bits() to verify mask X-Git-Tag: 5.13-rc-smb3-part3~60^2~2 X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=22d483b99863202e3631ff66fa0f3c2302c0f96f;p=sfrench%2Fcifs-2.6.git fanotify_user: use upper_32_bits() to verify mask 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 Cc: Jan Kara Link: https://lore.kernel.org/r/20210325083742.2334933-1-brauner@kernel.org Signed-off-by: Christian Brauner Signed-off-by: Jan Kara --- diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c index 65142b1fa823..71fefb30e015 100644 --- a/fs/notify/fanotify/fanotify_user.c +++ b/fs/notify/fanotify/fanotify_user.c @@ -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)