Commit 9cab1ba4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 

* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
  nfs: don't lose MS_SYNCHRONOUS on remount of noac mount
  NFS: Return meaningful status from decode_secinfo()
  NFSv4: Ensure we request the ordinary fileid when doing readdirplus
  NFSv4: Ensure that clientid and session establishment can time out
  SUNRPC: Allow RPC calls to return ETIMEDOUT instead of EIO
  NFSv4.1: Don't loop forever in nfs4_proc_create_session
  NFSv4: Handle NFS4ERR_WRONGSEC outside of nfs4_handle_exception()
  NFSv4.1: Don't update sequence number if rpc_task is not sent
  NFSv4.1: Ensure state manager thread dies on last umount
  SUNRPC: Fix the SUNRPC Kerberos V RPCSEC_GSS module dependencies
  NFS: Use correct variable for page bounds checking
  NFS: don't negotiate when user specifies sec flavor
  NFS: Attempt mount with default sec flavor first
  NFS: flav_array honors NFS_MAX_SECFLAVORS
  NFS: Fix infinite loop in gss_create_upcall()
  Don't mark_inode_dirty_sync() while holding lock
  NFS: Get rid of pointless test in nfs_commit_done
  NFS: Remove unused argument from nfs_find_best_sec()
  NFS: Eliminate duplicate call to nfs_mark_request_dirty
  NFS: Remove dead code from nfs_fs_mount()
parents cc03638d 26c4c170

fs/nfs/namespace.c

+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ Elong: 
}



#ifdef CONFIG_NFS_V4

static rpc_authflavor_t nfs_find_best_sec(struct nfs4_secinfo_flavors *flavors, struct inode *inode)

static rpc_authflavor_t nfs_find_best_sec(struct nfs4_secinfo_flavors *flavors)

{

	struct gss_api_mech *mech;

	struct xdr_netobj oid;
@@ -166,7 +166,7 @@ static int nfs_negotiate_security(const struct dentry *parent, 
		}

		flavors = page_address(page);

		ret = secinfo(parent->d_inode, &dentry->d_name, flavors);

		*flavor = nfs_find_best_sec(flavors, dentry->d_inode);

		*flavor = nfs_find_best_sec(flavors);

		put_page(page);

	}

fs/nfs/nfs4_fs.h

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ enum nfs4_client_state { 
	NFS4CLNT_LAYOUTRECALL,

	NFS4CLNT_SESSION_RESET,

	NFS4CLNT_RECALL_SLOT,

	NFS4CLNT_LEASE_CONFIRM,

};



enum nfs4_session_state {

fs/nfs/nfs4proc.c

+58 −60
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include <linux/nfs4.h>

#include <linux/nfs_fs.h>

#include <linux/nfs_page.h>

#include <linux/nfs_mount.h>

#include <linux/namei.h>

#include <linux/mount.h>

#include <linux/module.h>
@@ -443,8 +444,8 @@ static int nfs41_sequence_done(struct rpc_task *task, struct nfs4_sequence_res * 
	if (res->sr_status == 1)

		res->sr_status = NFS_OK;



	/* -ERESTARTSYS can result in skipping nfs41_sequence_setup */

	if (!res->sr_slot)

	/* don't increment the sequence number if the task wasn't sent */

	if (!RPC_WAS_SENT(task))

		goto out;



	/* Check the SEQUENCE operation status */
@@ -2185,9 +2186,14 @@ static int nfs4_lookup_root(struct nfs_server *server, struct nfs_fh *fhandle, 
	struct nfs4_exception exception = { };

	int err;

	do {

		err = nfs4_handle_exception(server,

				_nfs4_lookup_root(server, fhandle, info),

				&exception);

		err = _nfs4_lookup_root(server, fhandle, info);

		switch (err) {

		case 0:

		case -NFS4ERR_WRONGSEC:

			break;

		default:

			err = nfs4_handle_exception(server, err, &exception);

		}

	} while (exception.retry);

	return err;

}
@@ -2208,25 +2214,47 @@ out: 
	return ret;

}



/*

 * get the file handle for the "/" directory on the server

 */

static int nfs4_proc_get_root(struct nfs_server *server, struct nfs_fh *fhandle,

static int nfs4_find_root_sec(struct nfs_server *server, struct nfs_fh *fhandle,

			      struct nfs_fsinfo *info)

{

	int i, len, status = 0;

	rpc_authflavor_t flav_array[NFS_MAX_SECFLAVORS + 2];

	rpc_authflavor_t flav_array[NFS_MAX_SECFLAVORS];



	flav_array[0] = RPC_AUTH_UNIX;

	len = gss_mech_list_pseudoflavors(&flav_array[1]);

	flav_array[1+len] = RPC_AUTH_NULL;

	len += 2;

	len = gss_mech_list_pseudoflavors(&flav_array[0]);

	flav_array[len] = RPC_AUTH_NULL;

	len += 1;



	for (i = 0; i < len; i++) {

		status = nfs4_lookup_root_sec(server, fhandle, info, flav_array[i]);

		if (status != -EPERM)

		if (status == -NFS4ERR_WRONGSEC || status == -EACCES)

			continue;

		break;

	}

	/*

	 * -EACCESS could mean that the user doesn't have correct permissions

	 * to access the mount.  It could also mean that we tried to mount

	 * with a gss auth flavor, but rpc.gssd isn't running.  Either way,

	 * existing mount programs don't handle -EACCES very well so it should

	 * be mapped to -EPERM instead.

	 */

	if (status == -EACCES)

		status = -EPERM;

	return status;

}



/*

 * get the file handle for the "/" directory on the server

 */

static int nfs4_proc_get_root(struct nfs_server *server, struct nfs_fh *fhandle,

			      struct nfs_fsinfo *info)

{

	int status = nfs4_lookup_root(server, fhandle, info);

	if ((status == -NFS4ERR_WRONGSEC) && !(server->flags & NFS_MOUNT_SECFLAVOUR))

		/*

		 * A status of -NFS4ERR_WRONGSEC will be mapped to -EPERM

		 * by nfs4_map_errors() as this function exits.

		 */

		status = nfs4_find_root_sec(server, fhandle, info);

	if (status == 0)

		status = nfs4_server_capabilities(server, fhandle);

	if (status == 0)
@@ -3723,21 +3751,20 @@ int nfs4_proc_setclientid(struct nfs_client *clp, u32 program, 
				sizeof(setclientid.sc_uaddr), "%s.%u.%u",

				clp->cl_ipaddr, port >> 8, port & 255);



		status = rpc_call_sync(clp->cl_rpcclient, &msg, 0);

		status = rpc_call_sync(clp->cl_rpcclient, &msg, RPC_TASK_TIMEOUT);

		if (status != -NFS4ERR_CLID_INUSE)

			break;

		if (signalled())

		if (loop != 0) {

			++clp->cl_id_uniquifier;

			break;

		if (loop++ & 1)

		}

		++loop;

		ssleep(clp->cl_lease_time / HZ + 1);

		else

			if (++clp->cl_id_uniquifier == 0)

				break;

	}

	return status;

}



static int _nfs4_proc_setclientid_confirm(struct nfs_client *clp,

int nfs4_proc_setclientid_confirm(struct nfs_client *clp,

		struct nfs4_setclientid_res *arg,

		struct rpc_cred *cred)

{
@@ -3752,7 +3779,7 @@ static int _nfs4_proc_setclientid_confirm(struct nfs_client *clp, 
	int status;



	now = jiffies;

	status = rpc_call_sync(clp->cl_rpcclient, &msg, 0);

	status = rpc_call_sync(clp->cl_rpcclient, &msg, RPC_TASK_TIMEOUT);

	if (status == 0) {

		spin_lock(&clp->cl_lock);

		clp->cl_lease_time = fsinfo.lease_time * HZ;
@@ -3762,26 +3789,6 @@ static int _nfs4_proc_setclientid_confirm(struct nfs_client *clp, 
	return status;

}



int nfs4_proc_setclientid_confirm(struct nfs_client *clp,

		struct nfs4_setclientid_res *arg,

		struct rpc_cred *cred)

{

	long timeout = 0;

	int err;

	do {

		err = _nfs4_proc_setclientid_confirm(clp, arg, cred);

		switch (err) {

			case 0:

				return err;

			case -NFS4ERR_RESOURCE:

				/* The IBM lawyers misread another document! */

			case -NFS4ERR_DELAY:

				err = nfs4_delay(clp->cl_rpcclient, &timeout);

		}

	} while (err == 0);

	return err;

}



struct nfs4_delegreturndata {

	struct nfs4_delegreturnargs args;

	struct nfs4_delegreturnres res;
@@ -4786,7 +4793,7 @@ int nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred) 
				init_utsname()->domainname,

				clp->cl_rpcclient->cl_auth->au_flavor);



	status = rpc_call_sync(clp->cl_rpcclient, &msg, 0);

	status = rpc_call_sync(clp->cl_rpcclient, &msg, RPC_TASK_TIMEOUT);

	if (!status)

		status = nfs4_check_cl_exchange_flags(clp->cl_exchange_flags);

	dprintk("<-- %s status= %d\n", __func__, status);
@@ -4869,7 +4876,8 @@ int nfs4_proc_get_lease_time(struct nfs_client *clp, struct nfs_fsinfo *fsinfo) 
		.rpc_client = clp->cl_rpcclient,

		.rpc_message = &msg,

		.callback_ops = &nfs4_get_lease_time_ops,

		.callback_data = &data

		.callback_data = &data,

		.flags = RPC_TASK_TIMEOUT,

	};

	int status;
@@ -5171,7 +5179,7 @@ static int _nfs4_proc_create_session(struct nfs_client *clp) 
	nfs4_init_channel_attrs(&args);

	args.flags = (SESSION4_PERSIST | SESSION4_BACK_CHAN);



	status = rpc_call_sync(session->clp->cl_rpcclient, &msg, 0);

	status = rpc_call_sync(session->clp->cl_rpcclient, &msg, RPC_TASK_TIMEOUT);



	if (!status)

		/* Verify the session's negotiated channel_attrs values */
@@ -5194,20 +5202,10 @@ int nfs4_proc_create_session(struct nfs_client *clp) 
	int status;

	unsigned *ptr;

	struct nfs4_session *session = clp->cl_session;

	long timeout = 0;

	int err;



	dprintk("--> %s clp=%p session=%p\n", __func__, clp, session);



	do {

	status = _nfs4_proc_create_session(clp);

		if (status == -NFS4ERR_DELAY) {

			err = nfs4_delay(clp->cl_rpcclient, &timeout);

			if (err)

				status = err;

		}

	} while (status == -NFS4ERR_DELAY);



	if (status)

		goto out;
@@ -5248,7 +5246,7 @@ int nfs4_proc_destroy_session(struct nfs4_session *session) 
	msg.rpc_argp = session;

	msg.rpc_resp = NULL;

	msg.rpc_cred = NULL;

	status = rpc_call_sync(session->clp->cl_rpcclient, &msg, 0);

	status = rpc_call_sync(session->clp->cl_rpcclient, &msg, RPC_TASK_TIMEOUT);



	if (status)

		printk(KERN_WARNING

fs/nfs/nfs4state.c

+34 −17
Original line number Diff line number Diff line
@@ -64,10 +64,15 @@ static LIST_HEAD(nfs4_clientid_list); 


int nfs4_init_clientid(struct nfs_client *clp, struct rpc_cred *cred)

{

	struct nfs4_setclientid_res clid;

	struct nfs4_setclientid_res clid = {

		.clientid = clp->cl_clientid,

		.confirm = clp->cl_confirm,

	};

	unsigned short port;

	int status;



	if (test_bit(NFS4CLNT_LEASE_CONFIRM, &clp->cl_state))

		goto do_confirm;

	port = nfs_callback_tcpport;

	if (clp->cl_addr.ss_family == AF_INET6)

		port = nfs_callback_tcpport6;
@@ -75,10 +80,14 @@ int nfs4_init_clientid(struct nfs_client *clp, struct rpc_cred *cred) 
	status = nfs4_proc_setclientid(clp, NFS4_CALLBACK, port, cred, &clid);

	if (status != 0)

		goto out;

	clp->cl_clientid = clid.clientid;

	clp->cl_confirm = clid.confirm;

	set_bit(NFS4CLNT_LEASE_CONFIRM, &clp->cl_state);

do_confirm:

	status = nfs4_proc_setclientid_confirm(clp, &clid, cred);

	if (status != 0)

		goto out;

	clp->cl_clientid = clid.clientid;

	clear_bit(NFS4CLNT_LEASE_CONFIRM, &clp->cl_state);

	nfs4_schedule_state_renewal(clp);

out:

	return status;
@@ -230,13 +239,18 @@ int nfs41_init_clientid(struct nfs_client *clp, struct rpc_cred *cred) 
{

	int status;



	if (test_bit(NFS4CLNT_LEASE_CONFIRM, &clp->cl_state))

		goto do_confirm;

	nfs4_begin_drain_session(clp);

	status = nfs4_proc_exchange_id(clp, cred);

	if (status != 0)

		goto out;

	set_bit(NFS4CLNT_LEASE_CONFIRM, &clp->cl_state);

do_confirm:

	status = nfs4_proc_create_session(clp);

	if (status != 0)

		goto out;

	clear_bit(NFS4CLNT_LEASE_CONFIRM, &clp->cl_state);

	nfs41_setup_state_renewal(clp);

	nfs_mark_client_ready(clp, NFS_CS_READY);

out:
@@ -1584,11 +1598,15 @@ static int nfs4_recall_slot(struct nfs_client *clp) { return 0; } 
 */

static void nfs4_set_lease_expired(struct nfs_client *clp, int status)

{

	if (nfs4_has_session(clp)) {

	switch (status) {

		case -NFS4ERR_DELAY:

	case -NFS4ERR_CLID_INUSE:

	case -NFS4ERR_STALE_CLIENTID:

		clear_bit(NFS4CLNT_LEASE_CONFIRM, &clp->cl_state);

		break;

	case -NFS4ERR_DELAY:

	case -ETIMEDOUT:

	case -EAGAIN:

		ssleep(1);

		break;



	case -EKEYEXPIRED:
@@ -1598,7 +1616,6 @@ static void nfs4_set_lease_expired(struct nfs_client *clp, int status) 
	default:

		return;

	}

	}

	set_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state);

}
@@ -1607,7 +1624,7 @@ static void nfs4_state_manager(struct nfs_client *clp) 
	int status = 0;



	/* Ensure exclusive access to NFSv4 state */

	for(;;) {

	do {

		if (test_and_clear_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state)) {

			/* We're going to have to re-establish a clientid */

			status = nfs4_reclaim_lease(clp);
@@ -1691,7 +1708,7 @@ static void nfs4_state_manager(struct nfs_client *clp) 
			break;

		if (test_and_set_bit(NFS4CLNT_MANAGER_RUNNING, &clp->cl_state) != 0)

			break;

	}

	} while (atomic_read(&clp->cl_count) > 1);

	return;

out_error:

	printk(KERN_WARNING "Error: state manager failed on NFSv4 server %s"

fs/nfs/nfs4xdr.c

+28 −25
Original line number Diff line number Diff line
@@ -1452,26 +1452,25 @@ static void encode_read(struct xdr_stream *xdr, const struct nfs_readargs *args, 


static void encode_readdir(struct xdr_stream *xdr, const struct nfs4_readdir_arg *readdir, struct rpc_rqst *req, struct compound_hdr *hdr)

{

	uint32_t attrs[2] = {0, 0};

	uint32_t attrs[2] = {

		FATTR4_WORD0_RDATTR_ERROR,

		FATTR4_WORD1_MOUNTED_ON_FILEID,

	};

	uint32_t dircount = readdir->count >> 1;

	__be32 *p;



	if (readdir->plus) {

		attrs[0] |= FATTR4_WORD0_TYPE|FATTR4_WORD0_CHANGE|FATTR4_WORD0_SIZE|

			FATTR4_WORD0_FSID|FATTR4_WORD0_FILEHANDLE;

			FATTR4_WORD0_FSID|FATTR4_WORD0_FILEHANDLE|FATTR4_WORD0_FILEID;

		attrs[1] |= FATTR4_WORD1_MODE|FATTR4_WORD1_NUMLINKS|FATTR4_WORD1_OWNER|

			FATTR4_WORD1_OWNER_GROUP|FATTR4_WORD1_RAWDEV|

			FATTR4_WORD1_SPACE_USED|FATTR4_WORD1_TIME_ACCESS|

			FATTR4_WORD1_TIME_METADATA|FATTR4_WORD1_TIME_MODIFY;

		dircount >>= 1;

	}

	attrs[0] |= FATTR4_WORD0_RDATTR_ERROR|FATTR4_WORD0_FILEID;

	attrs[1] |= FATTR4_WORD1_MOUNTED_ON_FILEID;

	/* Switch to mounted_on_fileid if the server supports it */

	if (readdir->bitmask[1] & FATTR4_WORD1_MOUNTED_ON_FILEID)

		attrs[0] &= ~FATTR4_WORD0_FILEID;

	else

		attrs[1] &= ~FATTR4_WORD1_MOUNTED_ON_FILEID;

	/* Use mounted_on_fileid only if the server supports it */

	if (!(readdir->bitmask[1] & FATTR4_WORD1_MOUNTED_ON_FILEID))

		attrs[0] |= FATTR4_WORD0_FILEID;



	p = reserve_space(xdr, 12+NFS4_VERIFIER_SIZE+20);

	*p++ = cpu_to_be32(OP_READDIR);
@@ -3140,7 +3139,7 @@ static int decode_attr_mounted_on_fileid(struct xdr_stream *xdr, uint32_t *bitma 
			goto out_overflow;

		xdr_decode_hyper(p, fileid);

		bitmap[1] &= ~FATTR4_WORD1_MOUNTED_ON_FILEID;

		ret = NFS_ATTR_FATTR_FILEID;

		ret = NFS_ATTR_FATTR_MOUNTED_ON_FILEID;

	}

	dprintk("%s: fileid=%Lu\n", __func__, (unsigned long long)*fileid);

	return ret;
@@ -4002,7 +4001,6 @@ static int decode_getfattr_attrs(struct xdr_stream *xdr, uint32_t *bitmap, 
{

	int status;

	umode_t fmode = 0;

	uint64_t fileid;

	uint32_t type;



	status = decode_attr_type(xdr, bitmap, &type);
@@ -4101,13 +4099,10 @@ static int decode_getfattr_attrs(struct xdr_stream *xdr, uint32_t *bitmap, 
		goto xdr_error;

	fattr->valid |= status;



	status = decode_attr_mounted_on_fileid(xdr, bitmap, &fileid);

	status = decode_attr_mounted_on_fileid(xdr, bitmap, &fattr->mounted_on_fileid);

	if (status < 0)

		goto xdr_error;

	if (status != 0 && !(fattr->valid & status)) {

		fattr->fileid = fileid;

	fattr->valid |= status;

	}



xdr_error:

	dprintk("%s: xdr returned %d\n", __func__, -status);
@@ -4838,17 +4833,21 @@ static int decode_secinfo(struct xdr_stream *xdr, struct nfs4_secinfo_res *res) 
	struct nfs4_secinfo_flavor *sec_flavor;

	int status;

	__be32 *p;

	int i;

	int i, num_flavors;



	status = decode_op_hdr(xdr, OP_SECINFO);

	if (status)

		goto out;

	p = xdr_inline_decode(xdr, 4);

	if (unlikely(!p))

		goto out_overflow;

	res->flavors->num_flavors = be32_to_cpup(p);



	for (i = 0; i < res->flavors->num_flavors; i++) {

	res->flavors->num_flavors = 0;

	num_flavors = be32_to_cpup(p);



	for (i = 0; i < num_flavors; i++) {

		sec_flavor = &res->flavors->flavors[i];

		if ((char *)&sec_flavor[1] - (char *)res > PAGE_SIZE)

		if ((char *)&sec_flavor[1] - (char *)res->flavors > PAGE_SIZE)

			break;



		p = xdr_inline_decode(xdr, 4);
@@ -4857,13 +4856,15 @@ static int decode_secinfo(struct xdr_stream *xdr, struct nfs4_secinfo_res *res) 
		sec_flavor->flavor = be32_to_cpup(p);



		if (sec_flavor->flavor == RPC_AUTH_GSS) {

			if (decode_secinfo_gss(xdr, sec_flavor))

				break;

			status = decode_secinfo_gss(xdr, sec_flavor);

			if (status)

				goto out;

		}

		res->flavors->num_flavors++;

	}



	return 0;



out:

	return status;

out_overflow:

	print_overflow_msg(__func__, xdr);

	return -EIO;
@@ -6408,7 +6409,9 @@ int nfs4_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry, 
	if (decode_getfattr_attrs(xdr, bitmap, entry->fattr, entry->fh,

					entry->server, 1) < 0)

		goto out_overflow;

	if (entry->fattr->valid & NFS_ATTR_FATTR_FILEID)

	if (entry->fattr->valid & NFS_ATTR_FATTR_MOUNTED_ON_FILEID)

		entry->ino = entry->fattr->mounted_on_fileid;

	else if (entry->fattr->valid & NFS_ATTR_FATTR_FILEID)

		entry->ino = entry->fattr->fileid;



	entry->d_type = DT_UNKNOWN;

CRA Git | Maintained and supported by SUSTech CRA and CCSE