From fe92746897af88cd2563f9586408d43b3ce692a8 Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Sun, 31 May 1998 18:30:42 +0000 Subject: [PATCH] Don't let the user try "rmdir ." Obtained from: NetBSD --- sys/nfs/nfs_vnops.c | 4 +++- sys/nfsclient/nfs_vnops.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c index c7edc3cb5bb3..52896caab347 100644 --- a/sys/nfs/nfs_vnops.c +++ b/sys/nfs/nfs_vnops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_vnops.c 8.16 (Berkeley) 5/27/95 - * $Id: nfs_vnops.c,v 1.96 1998/05/31 18:27:07 peter Exp $ + * $Id: nfs_vnops.c,v 1.97 1998/05/31 18:28:45 peter Exp $ */ @@ -1900,6 +1900,8 @@ nfs_rmdir(ap) struct mbuf *mreq, *mrep, *md, *mb, *mb2; int v3 = NFS_ISV3(dvp); + if (dvp == vp) + return (EINVAL); nfsstats.rpccnt[NFSPROC_RMDIR]++; nfsm_reqhead(dvp, NFSPROC_RMDIR, NFSX_FH(v3) + NFSX_UNSIGNED + nfsm_rndup(cnp->cn_namelen)); diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c index c7edc3cb5bb3..52896caab347 100644 --- a/sys/nfsclient/nfs_vnops.c +++ b/sys/nfsclient/nfs_vnops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_vnops.c 8.16 (Berkeley) 5/27/95 - * $Id: nfs_vnops.c,v 1.96 1998/05/31 18:27:07 peter Exp $ + * $Id: nfs_vnops.c,v 1.97 1998/05/31 18:28:45 peter Exp $ */ @@ -1900,6 +1900,8 @@ nfs_rmdir(ap) struct mbuf *mreq, *mrep, *md, *mb, *mb2; int v3 = NFS_ISV3(dvp); + if (dvp == vp) + return (EINVAL); nfsstats.rpccnt[NFSPROC_RMDIR]++; nfsm_reqhead(dvp, NFSPROC_RMDIR, NFSX_FH(v3) + NFSX_UNSIGNED + nfsm_rndup(cnp->cn_namelen));