patch 23/38: SERVER: type checking in fh_verify()
From: Kendrick M. Smith <hidden>
Date: 2002-08-13 23:05:48
Also in:
lkml
Change the type checking in fh_verify(). This fixes a bug which I reported on the mailing list a few days ago, and also adds a new error code nfserr_symlink (v4 only). This is returned whenever an operation which is illegal for symlinks is attempted on a symlink, and takes precedence over ERR_NOTDIR or ERR_INVAL.
--- old/fs/nfsd/nfsfh.c Wed Jul 24 16:03:25 2002
+++ new/fs/nfsd/nfsfh.c Mon Jul 29 12:39:43 2002@@ -234,11 +234,23 @@ fh_verify(struct svc_rqst *rqstp, struct /* Type can be negative when creating hardlinks - not to a dir */ if (type > 0 && (inode->i_mode & S_IFMT) != type) { - error = (type == S_IFDIR)? nfserr_notdir : nfserr_isdir; + if (rqstp->rq_vers == 4 && (inode->i_mode & S_IFMT) == S_IFLNK) + error = nfserr_symlink; + else if (type == S_IFDIR) + error = nfserr_notdir; + else if ((inode->i_mode & S_IFMT) == S_IFDIR) + error = nfserr_isdir; + else + error = nfserr_inval; goto out; } if (type < 0 && (inode->i_mode & S_IFMT) == -type) { - error = (type == -S_IFDIR)? nfserr_notdir : nfserr_isdir; + if (rqstp->rq_vers == 4 && (inode->i_mode & S_IFMT) == S_IFLNK) + error = nfserr_symlink; + else if (type == -S_IFDIR) + error = nfserr_isdir; + else + error = nfserr_notdir; goto out; } -------------------------------------------------------
This sf.net email is sponsored by: Dice - The leading online job board for high-tech professionals. Search and apply for tech jobs today! http://seeker.dice.com/seeker.epl?rel_code=31 _______________________________________________ NFS maillist - NFS@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/nfs