X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fmount_zfs%2Fmount_zfs.c;h=cd2731446684960954df7eeaa52eba55f5a6a617;hb=5990da81a798c087d323ba9104a6696bef2d275f;hp=0a69d69d79e3dedff28a5cfd3432dcbe3e436816;hpb=c171ea71bbedde9c30c39ce96d555bfd585e49a2;p=zfs.git

diff --git a/cmd/mount_zfs/mount_zfs.c b/cmd/mount_zfs/mount_zfs.c
index 0a69d69..cd27314 100644
--- a/cmd/mount_zfs/mount_zfs.c
+++ b/cmd/mount_zfs/mount_zfs.c
@@ -311,7 +311,8 @@ main(int argc, char **argv)
 	char mntopts[MNT_LINE_MAX] = { '\0' };
 	char badopt[MNT_LINE_MAX] = { '\0' };
 	char mtabopt[MNT_LINE_MAX] = { '\0' };
-	char *dataset, *mntpoint;
+	char mntpoint[PATH_MAX];
+	char *dataset;
 	unsigned long mntflags = 0, zfsflags = 0, remount = 0;
 	int sloppy = 0, fake = 0, verbose = 0, nomtab = 0, zfsutil = 0;
 	int error, c;
@@ -367,7 +368,14 @@ main(int argc, char **argv)
 	}
 
 	dataset = parse_dataset(argv[0]);
-	mntpoint = argv[1];
+
+	/* canonicalize the mount point */
+	if (realpath(argv[1], mntpoint) == NULL) {
+		(void) fprintf(stderr, gettext("filesystem '%s' cannot be "
+		    "mounted at '%s' due to canonicalization error %d.\n"),
+		    dataset, argv[1], errno);
+		return (MOUNT_SYSERR);
+	}
 
 	/* validate mount options and set mntflags */
 	error = parse_options(mntopts, &mntflags, &zfsflags, sloppy,
@@ -467,7 +475,8 @@ main(int argc, char **argv)
 		return (MOUNT_USAGE);
 	}
 
-	if (!zfsutil && strcmp(legacy, ZFS_MOUNTPOINT_LEGACY) && !remount) {
+	if (!zfsutil && !(remount || fake) &&
+	    strcmp(legacy, ZFS_MOUNTPOINT_LEGACY)) {
 		(void) fprintf(stderr, gettext(
 		    "filesystem '%s' cannot be mounted using 'mount'.\n"
 		    "Use 'zfs set mountpoint=%s' or 'zfs mount %s'.\n"