From 4fd3fbfa130768e2c36aac651bd41e1d4babc6c5 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Wed, 12 May 2021 21:22:02 +0100 Subject: [PATCH] Revert "fuse: fix matching of FUSE_DEV_IOC_CLONE command" This reverts commit 6076f5f341e612152879bfda99f0b76c1953bf0b. This is currently breaking avd/avd_boot_test_kernel_triggered on kernel_virt_x86_64, when tested against android-mainline which is preventing an up-level to v5.13-rc1. We can do some more investigation later, but for now, we'll simply revert the change. Signed-off-by: Lee Jones Change-Id: I56d3360a7cc0f176da102ab59fdcf2e3b9f2a46d --- fs/fuse/dev.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index ec73fde44b22..38136c5eb313 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -2243,8 +2243,11 @@ static long fuse_dev_ioctl(struct file *file, unsigned int cmd, struct fuse_dev *fud = NULL; struct fuse_passthrough_out pto; - switch (cmd) { - case FUSE_DEV_IOC_CLONE: + if (_IOC_TYPE(cmd) != FUSE_DEV_IOC_MAGIC) + return -ENOTTY; + + switch (_IOC_NR(cmd)) { + case _IOC_NR(FUSE_DEV_IOC_CLONE): res = -EFAULT; if (!get_user(oldfd, (__u32 __user *)arg)) { struct file *old = fget(oldfd);