]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
fs: compat: Remove warning from COMPATIBLE_IOCTL
authorMark Charlebois <charlebm@gmail.com>
Fri, 28 Apr 2017 22:15:12 +0000 (15:15 -0700)
committerSasha Levin <alexander.levin@microsoft.com>
Wed, 23 May 2018 01:33:56 +0000 (21:33 -0400)
[ Upstream commit 9280cdd6fe5b8287a726d24cc1d558b96c8491d7 ]

cmd in COMPATIBLE_IOCTL is always a u32, so cast it so there isn't a
warning about an overflow in XFORM.

From: Mark Charlebois <charlebm@gmail.com>
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
Signed-off-by: Behan Webster <behanw@converseincode.com>
Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
fs/compat_ioctl.c

index 6b8e2f091f5b8fd71d63d545ea5fe9ae593d7688..5e6798a3c9b6ff7834e40aae2d2773067ea89a45 100644 (file)
@@ -811,7 +811,7 @@ static int compat_ioctl_preallocate(struct file *file,
  */
 #define XFORM(i) (((i) ^ ((i) << 27) ^ ((i) << 17)) & 0xffffffff)
 
-#define COMPATIBLE_IOCTL(cmd) XFORM(cmd),
+#define COMPATIBLE_IOCTL(cmd) XFORM((u32)cmd),
 /* ioctl should not be warned about even if it's not implemented.
    Valid reasons to use this:
    - It is implemented with ->compat_ioctl on some device, but programs