nfsd: check d_can_lookup in fh_verify of directories
Create and other nfsd ops generally assume we can call lookup_one_len on inodes with S_IFDIR set. Al says that this assumption isn't true in general, though it should be for the filesystem objects nfsd sees. Add a check just to make sure our assumption isn't violated. Remove a couple checks for i_op->lookup in create code. Cc: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
@@ -1169,9 +1169,6 @@ nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp,
|
||||
dentry = fhp->fh_dentry;
|
||||
dirp = d_inode(dentry);
|
||||
|
||||
err = nfserr_notdir;
|
||||
if (!dirp->i_op->lookup)
|
||||
goto out;
|
||||
/*
|
||||
* Check whether the response file handle has been verified yet.
|
||||
* If it has, the parent directory should already be locked.
|
||||
@@ -1310,12 +1307,6 @@ do_nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp,
|
||||
dentry = fhp->fh_dentry;
|
||||
dirp = d_inode(dentry);
|
||||
|
||||
/* Get all the sanity checks out of the way before
|
||||
* we lock the parent. */
|
||||
err = nfserr_notdir;
|
||||
if (!dirp->i_op->lookup)
|
||||
goto out;
|
||||
|
||||
host_err = fh_want_write(fhp);
|
||||
if (host_err)
|
||||
goto out_nfserr;
|
||||
|
Reference in New Issue
Block a user