On Mon, Jan 25, 2021 at 4:31 PM Alessio Balsini <bals...@android.com> wrote:
>
> With a 64-bit kernel build the FUSE device cannot handle ioctl requests
> coming from 32-bit user space.
> This is due to the ioctl command translation that generates different
> command identifiers that thus cannot be used for direct comparisons
> without proper manipulation.
>
> Explicitly extract type and number from the ioctl command to enable
> 32-bit user space compatibility on 64-bit kernel builds.
>
> Signed-off-by: Alessio Balsini <bals...@android.com>
> ---
> fs/fuse/dev.c | 29 ++++++++++++++++++-----------
> include/uapi/linux/fuse.h | 3 ++-
> 2 files changed, 20 insertions(+), 12 deletions(-)
>
> diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
> index 588f8d1240aa..ff9f3b83f879 100644
> --- a/fs/fuse/dev.c
> +++ b/fs/fuse/dev.c
> @@ -2233,37 +2233,44 @@ static int fuse_device_clone(struct fuse_conn *fc,
> struct file *new)
> static long fuse_dev_ioctl(struct file *file, unsigned int cmd,
> unsigned long arg)
> {
> - int err = -ENOTTY;
> + int res;
> + int oldfd;
> + struct fuse_dev *fud = NULL;
>
> - if (cmd == FUSE_DEV_IOC_CLONE) {
> - int oldfd;
> + if (_IOC_TYPE(cmd) != FUSE_DEV_IOC_MAGIC)
> + return -EINVAL;
Why change ENOTTY to EINVAL?
Thanks,
MIklos
