From 52a7581d03531b45140ebe98a717048728ea2ca8 Mon Sep 17 00:00:00 2001 From: Davide Italiano Date: Sat, 14 Sep 2013 07:22:32 +0200 Subject: [PATCH] Fix up cross-device rename checks in zfs_rename(). This adds a check for the case where 'fdvp' is a directory, 'tvp' is an already existing directory and they have different mount points. Reported by: avg, pjd --- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c index 2716c25..d9dacbf 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c @@ -6250,12 +6250,15 @@ zfs_freebsd_rename(ap) ASSERT(ap->a_fcnp->cn_flags & (SAVENAME|SAVESTART)); ASSERT(ap->a_tcnp->cn_flags & (SAVENAME|SAVESTART)); - if (fdvp->v_mount == tdvp->v_mount) + /* + * Check for cross-device rename. + */ + if ((fdvp->v_mount != tdvp->v_mount) || + (tvp && (fdvp->v_mount != tvp->v_mount))) + error = EXDEV; + else error = zfs_rename(fdvp, ap->a_fcnp->cn_nameptr, tdvp, ap->a_tcnp->cn_nameptr, ap->a_fcnp->cn_cred, NULL, 0); - else - error = EXDEV; - if (tdvp == tvp) VN_RELE(tdvp); else -- 1.8.1.3