| From 9280cdd6fe5b8287a726d24cc1d558b96c8491d7 Mon Sep 17 00:00:00 2001 |
| From: Mark Charlebois <charlebm@gmail.com> |
| Date: Fri, 28 Apr 2017 15:15:12 -0700 |
| Subject: fs: compat: Remove warning from COMPATIBLE_IOCTL |
| |
| From: Mark Charlebois <charlebm@gmail.com> |
| |
| commit 9280cdd6fe5b8287a726d24cc1d558b96c8491d7 upstream. |
| |
| 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> |
| Cc: Nathan Chancellor <natechancellor@gmail.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| fs/compat_ioctl.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/fs/compat_ioctl.c |
| +++ b/fs/compat_ioctl.c |
| @@ -811,7 +811,7 @@ static int compat_ioctl_preallocate(stru |
| */ |
| #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 |
