From 821692d618cb6e93ede3d1bab7ce49a83bea83e2 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Sat, 7 Oct 1995 10:14:12 +0000
Subject: Return EINVAL instead of panicing for rename("dir1", "dir2/..").

Fixes part of PR 760.

This bug seems to be very old.
---
 sys/fs/msdosfs/msdosfs_vnops.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'sys/fs')

diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index 6689d1de9705..e3b4a5c63493 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_vnops.c,v 1.22 1995/08/25 20:12:23 bde Exp $ */
+/*	$Id: msdosfs_vnops.c,v 1.23 1995/09/04 00:20:45 dyson Exp $ */
 /*	$NetBSD: msdosfs_vnops.c,v 1.20 1994/08/21 18:44:13 ws Exp $	*/
 
 /*-
@@ -1031,7 +1031,8 @@ msdosfs_rename(ap)
 		if ((ap->a_fcnp->cn_namelen == 1
 		     && ap->a_fcnp->cn_nameptr[0] == '.')
 		    || fddep == fdep
-		    || (ap->a_fcnp->cn_flags & ISDOTDOT)) {
+		    || (ap->a_fcnp->cn_flags | ap->a_tcnp->cn_flags)
+		       & ISDOTDOT) {
 			VOP_ABORTOP(ap->a_tdvp, ap->a_tcnp);
 			vput(ap->a_tdvp);
 			if (tvp)
-- 
cgit v1.2.3