Skip to content

Commit

Permalink
fuse: ignore 'data' argument of mount(..., MS_REMOUNT)
Browse files Browse the repository at this point in the history
The command

  mount -o remount -o unknownoption /mnt/fuse

succeeds on kernel versions prior to v5.4 and fails on kernel version at or
after.  This is because fuse_parse_param() rejects any unrecognised options
in case of FS_CONTEXT_FOR_RECONFIGURE, just as for FS_CONTEXT_FOR_MOUNT.

This causes a regression in case the fuse filesystem is in fstab, since
remount sends all options found there to the kernel; even ones that are
meant for the initial mount and are consumed by the userspace fuse server.

Fix this by ignoring mount options, just as fuse_remount_fs() did prior to
the conversion to the new API.

Reported-by: Stefan Priebe <s.priebe@profihost.ag>
Fixes: c30da2e ("fuse: convert to use the new mount API")
Cc: <stable@vger.kernel.org> # v5.4
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
  • Loading branch information
Miklos Szeredi committed Jul 14, 2020
1 parent 0189a2d commit e8b20a4
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions fs/fuse/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,13 @@ static int fuse_parse_param(struct fs_context *fc, struct fs_parameter *param)
struct fuse_fs_context *ctx = fc->fs_private;
int opt;

/*
* Ignore options coming from mount(MS_REMOUNT) for backward
* compatibility.
*/
if (fc->purpose == FS_CONTEXT_FOR_RECONFIGURE)
return 0;

opt = fs_parse(fc, fuse_fs_parameters, param, &result);
if (opt < 0)
return opt;
Expand Down

0 comments on commit e8b20a4

Please sign in to comment.