X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fmount_zfs%2Fmount_zfs.c;fp=cmd%2Fmount_zfs%2Fmount_zfs.c;h=6dd831d769f353e26df429129341d4e32c885e66;hb=33364b15d302abfb2945129994b9cf42e61dc302;hp=0a69d69d79e3dedff28a5cfd3432dcbe3e436816;hpb=54602c37718eca0dbeb668321edf5dfc41dcbe93;p=zfs.git

diff --git a/cmd/mount_zfs/mount_zfs.c b/cmd/mount_zfs/mount_zfs.c
index 0a69d69..6dd831d 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,13 @@ 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 due to a canonicalization failure.\n"), dataset);
+		return (MOUNT_SYSERR);
+	}
 
 	/* validate mount options and set mntflags */
 	error = parse_options(mntopts, &mntflags, &zfsflags, sloppy,