Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03a816b4 authored by Steve Dickson's avatar Steve Dickson Committed by J. Bruce Fields
Browse files

nfsd: restrict filehandles accepted in V4ROOT case 



On V4ROOT exports, only accept filehandles that are the *root* of some
export.  This allows mountd to allow or deny access to individual
directories and symlinks on the pseudofilesystem.

Note that the checks in readdir and lookup are not enough, since a
malicious host with access to the network could guess filehandles that
they weren't able to obtain through lookup or readdir.

Signed-off-by: default avatarSteve Dickson <steved@redhat.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent f2ca7153

fs/nfsd/nfsd.h

+5 −0
Original line number Diff line number Diff line
@@ -70,6 +70,11 @@ int nfsd_create_serv(void); 


extern int nfsd_max_blksize;



static inline int nfsd_v4client(struct svc_rqst *rq)

{

	return rq->rq_prog == NFS_PROGRAM && rq->rq_vers == 4;

}



/* 

 * NFSv4 State

 */

fs/nfsd/nfsfh.c

+34 −0
Original line number Diff line number Diff line
@@ -103,6 +103,36 @@ static __be32 nfsd_setuser_and_check_port(struct svc_rqst *rqstp, 
	return nfserrno(nfsd_setuser(rqstp, exp));

}



static inline __be32 check_pseudo_root(struct svc_rqst *rqstp,

	struct dentry *dentry, struct svc_export *exp)

{

	if (!(exp->ex_flags & NFSEXP_V4ROOT))

		return nfs_ok;

	/*

	 * v2/v3 clients have no need for the V4ROOT export--they use

	 * the mount protocl instead; also, further V4ROOT checks may be

	 * in v4-specific code, in which case v2/v3 clients could bypass

	 * them.

	 */

	if (!nfsd_v4client(rqstp))

		return nfserr_stale;

	/*

	 * We're exposing only the directories and symlinks that have to be

	 * traversed on the way to real exports:

	 */

	if (unlikely(!S_ISDIR(dentry->d_inode->i_mode) &&

		     !S_ISLNK(dentry->d_inode->i_mode)))

		return nfserr_stale;

	/*

	 * A pseudoroot export gives permission to access only one

	 * single directory; the kernel has to make another upcall

	 * before granting access to anything else under it:

	 */

	if (unlikely(dentry != exp->ex_path.dentry))

		return nfserr_stale;

	return nfs_ok;

}



/*

 * Use the given filehandle to look up the corresponding export and

 * dentry.  On success, the results are used to set fh_export and
@@ -299,6 +329,10 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, int access) 
	 *	  (for example, if different id-squashing options are in

	 *	  effect on the new filesystem).

	 */

	error = check_pseudo_root(rqstp, dentry, exp);

	if (error)

		goto out;



	error = nfsd_setuser_and_check_port(rqstp, exp);

	if (error)

		goto out;

fs/nfsd/vfs.c

+0 −6
Original line number Diff line number Diff line
@@ -72,12 +72,6 @@ struct raparm_hbucket { 
#define RAPARM_HASH_MASK	(RAPARM_HASH_SIZE-1)

static struct raparm_hbucket	raparm_hash[RAPARM_HASH_SIZE];



static inline int

nfsd_v4client(struct svc_rqst *rq)

{

    return rq->rq_prog == NFS_PROGRAM && rq->rq_vers == 4;

}



/* 

 * Called from nfsd_lookup and encode_dirent. Check if we have crossed 

 * a mount point.