From c7dfc086297b6e7768e94d1eef3afaa58beeb5ec Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Wed, 17 Oct 2012 13:23:09 -0700 Subject: [PATCH] Quote snapshot and mountpoint for .zfs automount When automounting a snapshot in the .zfs/snapshot directory make sure to quote both the dataset name and the mount point. This ensures that if either component contains spaces, which are allowed, they get handled correctly. Signed-off-by: Brian Behlendorf Closes #1027 --- module/zfs/zfs_ctldir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/zfs/zfs_ctldir.c b/module/zfs/zfs_ctldir.c index 41d336564..d139b8613 100644 --- a/module/zfs/zfs_ctldir.c +++ b/module/zfs/zfs_ctldir.c @@ -681,7 +681,7 @@ zfsctl_snapdir_inactive(struct inode *ip) "exec 0/dev/null " \ " 2>/dev/null; " \ - "umount -t zfs -n %s%s" + "umount -t zfs -n '%s%s'" static int __zfsctl_unmount_snapshot(zfs_snapentry_t *sep, int flags) @@ -781,7 +781,7 @@ zfsctl_unmount_snapshots(zfs_sb_t *zsb, int flags, int *count) "exec 0/dev/null " \ " 2>/dev/null; " \ - "mount -t zfs -n %s %s" + "mount -t zfs -n '%s' '%s'" int zfsctl_mount_snapshot(struct path *path, int flags)