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

Commit 03c21733 authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Trond Myklebust
Browse files

NFSv3: try get_root user-supplied security_flavor 



 Thanks to Ed Keizer for bug and root cause.  He says: "... we could only mount
 the top-level Solaris share. We could not mount deeper into the tree.
 Investigation showed that Solaris allows UNIX authenticated FSINFO only on the
 top level of the share. This is a problem because we share/export our home
 directories one level higher than we mount them. I.e. we share the partition
 and not the individual home directories. This prevented access to home
 directories."

 We still may need to try auth_sys for the case where the client doesn't have
 appropriate credentials.

 Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
 Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent a659753e

fs/nfs/nfs3proc.c

+19 −7
Original line number Diff line number Diff line
@@ -68,26 +68,38 @@ nfs3_async_handle_jukebox(struct rpc_task *task) 
	return 1;

}



/*

 * Bare-bones access to getattr: this is for nfs_read_super.

 */

static int

nfs3_proc_get_root(struct nfs_server *server, struct nfs_fh *fhandle,

do_proc_get_root(struct rpc_clnt *client, struct nfs_fh *fhandle,

		 struct nfs_fsinfo *info)

{

	int	status;



	dprintk("%s: call  fsinfo\n", __FUNCTION__);

	nfs_fattr_init(info->fattr);

	status = rpc_call(server->client_sys, NFS3PROC_FSINFO, fhandle, info, 0);

	status = rpc_call(client, NFS3PROC_FSINFO, fhandle, info, 0);

	dprintk("%s: reply fsinfo: %d\n", __FUNCTION__, status);

	if (!(info->fattr->valid & NFS_ATTR_FATTR)) {

		status = rpc_call(server->client_sys, NFS3PROC_GETATTR, fhandle, info->fattr, 0);

		status = rpc_call(client, NFS3PROC_GETATTR, fhandle, info->fattr, 0);

		dprintk("%s: reply getattr: %d\n", __FUNCTION__, status);

	}

	return status;

}



/*

 * Bare-bones access to getattr: this is for nfs_read_super.

 */

static int

nfs3_proc_get_root(struct nfs_server *server, struct nfs_fh *fhandle,

		   struct nfs_fsinfo *info)

{

	int	status;



	status = do_proc_get_root(server->client, fhandle, info);

	if (status && server->client_sys != server->client)

		status = do_proc_get_root(server->client_sys, fhandle, info);

	return status;

}



/*

 * One function for each procedure in the NFS protocol.

 */