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

Commit e95003c3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfs-for-3.14-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs 

Pull NFS client bugfixes from Trond Myklebust:
 "Highlights include stable fixes for the following bugs:

   - General performance regression due to NFS_INO_INVALID_LABEL being
     set when the server doesn't support labeled NFS
   - Hang in the RPC code due to a socket out-of-buffer race
   - Infinite loop when trying to establish the NFSv4 lease
   - Use-after-free bug in the RPCSEC gss code.
   - nfs4_select_rw_stateid is returning with a non-zero error value on
     success

  Other bug fixes:

  - Potential memory scribble in the RPC bi-directional RPC code
  - Pipe version reference leak
  - Use the correct net namespace in the new NFSv4 migration code"

* tag 'nfs-for-3.14-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  NFS fix error return in nfs4_select_rw_stateid
  NFSv4: Use the correct net namespace in nfs4_update_server
  SUNRPC: Fix a pipe_version reference leak
  SUNRPC: Ensure that gss_auth isn't freed before its upcall messages
  SUNRPC: Fix potential memory scribble in xprt_free_bc_request()
  SUNRPC: Fix races in xs_nospace()
  SUNRPC: Don't create a gss auth cache unless rpc.gssd is running
  NFS: Do not set NFS_INO_INVALID_LABEL unless server supports labeled NFS
parents 981adacd 146d70ca

fs/nfs/inode.c

+10 −4
Original line number Diff line number Diff line
@@ -164,17 +164,16 @@ static void nfs_zap_caches_locked(struct inode *inode) 
	if (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode)) {

		nfs_fscache_invalidate(inode);

		nfsi->cache_validity |= NFS_INO_INVALID_ATTR

					| NFS_INO_INVALID_LABEL

					| NFS_INO_INVALID_DATA

					| NFS_INO_INVALID_ACCESS

					| NFS_INO_INVALID_ACL

					| NFS_INO_REVAL_PAGECACHE;

	} else

		nfsi->cache_validity |= NFS_INO_INVALID_ATTR

					| NFS_INO_INVALID_LABEL

					| NFS_INO_INVALID_ACCESS

					| NFS_INO_INVALID_ACL

					| NFS_INO_REVAL_PAGECACHE;

	nfs_zap_label_cache_locked(nfsi);

}



void nfs_zap_caches(struct inode *inode)
@@ -266,6 +265,13 @@ nfs_init_locked(struct inode *inode, void *opaque) 
}



#ifdef CONFIG_NFS_V4_SECURITY_LABEL

static void nfs_clear_label_invalid(struct inode *inode)

{

	spin_lock(&inode->i_lock);

	NFS_I(inode)->cache_validity &= ~NFS_INO_INVALID_LABEL;

	spin_unlock(&inode->i_lock);

}



void nfs_setsecurity(struct inode *inode, struct nfs_fattr *fattr,

					struct nfs4_label *label)

{
@@ -283,6 +289,7 @@ void nfs_setsecurity(struct inode *inode, struct nfs_fattr *fattr, 
					__func__,

					(char *)label->label,

					label->len, error);

		nfs_clear_label_invalid(inode);

	}

}
@@ -1648,7 +1655,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) 
		inode->i_blocks = fattr->du.nfs2.blocks;



	/* Update attrtimeo value if we're out of the unstable period */

	if (invalid & (NFS_INO_INVALID_ATTR|NFS_INO_INVALID_LABEL)) {

	if (invalid & NFS_INO_INVALID_ATTR) {

		nfs_inc_stats(inode, NFSIOS_ATTRINVALIDATE);

		nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);

		nfsi->attrtimeo_timestamp = now;
@@ -1661,7 +1668,6 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) 
		}

	}

	invalid &= ~NFS_INO_INVALID_ATTR;

	invalid &= ~NFS_INO_INVALID_LABEL;

	/* Don't invalidate the data if we were to blame */

	if (!(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode)

				|| S_ISLNK(inode->i_mode)))

fs/nfs/internal.h

+11 −1
Original line number Diff line number Diff line
@@ -176,7 +176,8 @@ extern struct nfs_server *nfs4_create_server( 
extern struct nfs_server *nfs4_create_referral_server(struct nfs_clone_mount *,

						      struct nfs_fh *);

extern int nfs4_update_server(struct nfs_server *server, const char *hostname,

					struct sockaddr *sap, size_t salen);

					struct sockaddr *sap, size_t salen,

					struct net *net);

extern void nfs_free_server(struct nfs_server *server);

extern struct nfs_server *nfs_clone_server(struct nfs_server *,

					   struct nfs_fh *,
@@ -279,9 +280,18 @@ static inline void nfs4_label_free(struct nfs4_label *label) 
	}

	return;

}



static inline void nfs_zap_label_cache_locked(struct nfs_inode *nfsi)

{

	if (nfs_server_capable(&nfsi->vfs_inode, NFS_CAP_SECURITY_LABEL))

		nfsi->cache_validity |= NFS_INO_INVALID_LABEL;

}

#else

static inline struct nfs4_label *nfs4_label_alloc(struct nfs_server *server, gfp_t flags) { return NULL; }

static inline void nfs4_label_free(void *label) {}

static inline void nfs_zap_label_cache_locked(struct nfs_inode *nfsi)

{

}

#endif /* CONFIG_NFS_V4_SECURITY_LABEL */



/* proc.c */

fs/nfs/nfs4client.c

+4 −3
Original line number Diff line number Diff line
@@ -1135,6 +1135,7 @@ static int nfs_probe_destination(struct nfs_server *server) 
 * @hostname: new end-point's hostname

 * @sap: new end-point's socket address

 * @salen: size of "sap"

 * @net: net namespace

 *

 * The nfs_server must be quiescent before this function is invoked.

 * Either its session is drained (NFSv4.1+), or its transport is
@@ -1143,13 +1144,13 @@ static int nfs_probe_destination(struct nfs_server *server) 
 * Returns zero on success, or a negative errno value.

 */

int nfs4_update_server(struct nfs_server *server, const char *hostname,

		       struct sockaddr *sap, size_t salen)

		       struct sockaddr *sap, size_t salen, struct net *net)

{

	struct nfs_client *clp = server->nfs_client;

	struct rpc_clnt *clnt = server->client;

	struct xprt_create xargs = {

		.ident		= clp->cl_proto,

		.net		= &init_net,

		.net		= net,

		.dstaddr	= sap,

		.addrlen	= salen,

		.servername	= hostname,
@@ -1189,7 +1190,7 @@ int nfs4_update_server(struct nfs_server *server, const char *hostname, 
	error = nfs4_set_client(server, hostname, sap, salen, buf,

				clp->cl_rpcclient->cl_auth->au_flavor,

				clp->cl_proto, clnt->cl_timeout,

				clp->cl_minorversion, clp->cl_net);

				clp->cl_minorversion, net);

	nfs_put_client(clp);

	if (error != 0) {

		nfs_server_insert_lists(server);

fs/nfs/nfs4namespace.c

+6 −6
Original line number Diff line number Diff line
@@ -121,9 +121,8 @@ static int nfs4_validate_fspath(struct dentry *dentry, 
}



static size_t nfs_parse_server_name(char *string, size_t len,

		struct sockaddr *sa, size_t salen, struct nfs_server *server)

		struct sockaddr *sa, size_t salen, struct net *net)

{

	struct net *net = rpc_net_ns(server->client);

	ssize_t ret;



	ret = rpc_pton(net, string, len, sa, salen);
@@ -223,6 +222,7 @@ static struct vfsmount *try_location(struct nfs_clone_mount *mountdata, 
				     const struct nfs4_fs_location *location)

{

	const size_t addr_bufsize = sizeof(struct sockaddr_storage);

	struct net *net = rpc_net_ns(NFS_SB(mountdata->sb)->client);

	struct vfsmount *mnt = ERR_PTR(-ENOENT);

	char *mnt_path;

	unsigned int maxbuflen;
@@ -248,8 +248,7 @@ static struct vfsmount *try_location(struct nfs_clone_mount *mountdata, 
			continue;



		mountdata->addrlen = nfs_parse_server_name(buf->data, buf->len,

				mountdata->addr, addr_bufsize,

				NFS_SB(mountdata->sb));

				mountdata->addr, addr_bufsize, net);

		if (mountdata->addrlen == 0)

			continue;
@@ -419,6 +418,7 @@ static int nfs4_try_replacing_one_location(struct nfs_server *server, 
		const struct nfs4_fs_location *location)

{

	const size_t addr_bufsize = sizeof(struct sockaddr_storage);

	struct net *net = rpc_net_ns(server->client);

	struct sockaddr *sap;

	unsigned int s;

	size_t salen;
@@ -440,7 +440,7 @@ static int nfs4_try_replacing_one_location(struct nfs_server *server, 
			continue;



		salen = nfs_parse_server_name(buf->data, buf->len,

						sap, addr_bufsize, server);

						sap, addr_bufsize, net);

		if (salen == 0)

			continue;

		rpc_set_port(sap, NFS_PORT);
@@ -450,7 +450,7 @@ static int nfs4_try_replacing_one_location(struct nfs_server *server, 
		if (hostname == NULL)

			break;



		error = nfs4_update_server(server, hostname, sap, salen);

		error = nfs4_update_server(server, hostname, sap, salen, net);

		kfree(hostname);

		if (error == 0)

			break;

fs/nfs/nfs4state.c

+4 −1
Original line number Diff line number Diff line
@@ -1015,8 +1015,11 @@ int nfs4_select_rw_stateid(nfs4_stateid *dst, struct nfs4_state *state, 
	if (ret == -EIO)

		/* A lost lock - don't even consider delegations */

		goto out;

	if (nfs4_copy_delegation_stateid(dst, state->inode, fmode))

	/* returns true if delegation stateid found and copied */

	if (nfs4_copy_delegation_stateid(dst, state->inode, fmode)) {

		ret = 0;

		goto out;

	}

	if (ret != -ENOENT)

		/* nfs4_copy_delegation_stateid() didn't over-write

		 * dst, so it still has the lock stateid which we now