2021-03-19 15:08:32

by Alessio Balsini

Subject: [PATCH] fs/fuse: Fix matching of FUSE_DEV_IOC_CLONE command

With commit f8425c939663 ("fuse: 32-bit user space ioctl compat for fuse
device") the matching constraints for the FUSE_DEV_IOC_CLONE ioctl
command are relaxed, limited to the testing of command type and number.
As Arnd noticed, this is wrong as it wouldn't ensure the correctness of
the data size or direction for the received FUSE device ioctl.

Fix by bringing back the comparison of the ioctl received by the FUSE
device to the originally generated FUSE_DEV_IOC_CLONE.

Fixes: f8425c939663 ("fuse: 32-bit user space ioctl compat for fuse device")
Reported-by: Arnd Bergmann <[email protected]>
Signed-off-by: Alessio Balsini <[email protected]>
---
fs/fuse/dev.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index c0fee830a34e..a5ceccc5ef00 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -2233,11 +2233,8 @@ static long fuse_dev_ioctl(struct file *file, unsigned int cmd,
int oldfd;
struct fuse_dev *fud = NULL;

- if (_IOC_TYPE(cmd) != FUSE_DEV_IOC_MAGIC)
- return -ENOTTY;
-
- switch (_IOC_NR(cmd)) {
- case _IOC_NR(FUSE_DEV_IOC_CLONE):
+ switch (cmd) {
+ case FUSE_DEV_IOC_CLONE:
res = -EFAULT;
if (!get_user(oldfd, (__u32 __user *)arg)) {
struct file *old = fget(oldfd);
--
2.31.0.291.g576ba9dcdaf-goog

2021-03-22 15:06:46

by Miklos Szeredi

Subject: Re: [PATCH] fs/fuse: Fix matching of FUSE_DEV_IOC_CLONE command

On Fri, Mar 19, 2021 at 4:06 PM Alessio Balsini <[email protected]> wrote:
>
> With commit f8425c939663 ("fuse: 32-bit user space ioctl compat for fuse
> device") the matching constraints for the FUSE_DEV_IOC_CLONE ioctl
> command are relaxed, limited to the testing of command type and number.
> As Arnd noticed, this is wrong as it wouldn't ensure the correctness of
> the data size or direction for the received FUSE device ioctl.
>
> Fix by bringing back the comparison of the ioctl received by the FUSE
> device to the originally generated FUSE_DEV_IOC_CLONE.
>
> Fixes: f8425c939663 ("fuse: 32-bit user space ioctl compat for fuse device")
> Reported-by: Arnd Bergmann <[email protected]>
> Signed-off-by: Alessio Balsini <[email protected]>

Thanks, applied. I'm holding this till the 5.13 merge window unless
a more series fuse issue emerges in the meantime

Thanks,
Miklos