Commit 31fc92fc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfs-for-6.1-2' of git://git.linux-nfs.org/projects/anna/linux-nfs 

Pull NFS client bugfixes from Anna Schumaker:

 - Fix some coccicheck warnings

 - Avoid memcpy() run-time warning

 - Fix up various state reclaim / RECLAIM_COMPLETE errors

 - Fix a null pointer dereference in sysfs

 - Fix LOCK races

 - Fix gss_unwrap_resp_integ() crasher

 - Fix zero length clones

 - Fix memleak when allocate slot fails

* tag 'nfs-for-6.1-2' of git://git.linux-nfs.org/projects/anna/linux-nfs:
  nfs4: Fix kmemleak when allocate slot failed
  NFSv4.2: Fixup CLONE dest file size for zero-length count
  SUNRPC: Fix crasher in gss_unwrap_resp_integ()
  NFSv4: Retry LOCK on OLD_STATEID during delegation return
  SUNRPC: Fix null-ptr-deref when xps sysfs alloc failed
  NFSv4.1: We must always send RECLAIM_COMPLETE after a reboot
  NFSv4.1: Handle RECLAIM_COMPLETE trunking errors
  NFSv4: Fix a potential state reclaim deadlock
  NFS: Avoid memcpy() run-time warning for struct sockaddr overflows
  nfs: Remove redundant null checks before kfree
parents ae13366b 7e843672

fs/nfs/client.c

+2 −2
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ EXPORT_SYMBOL_GPL(nfs_put_client); 
static struct nfs_client *nfs_match_client(const struct nfs_client_initdata *data)

{

	struct nfs_client *clp;

	const struct sockaddr *sap = data->addr;

	const struct sockaddr *sap = (struct sockaddr *)data->addr;

	struct nfs_net *nn = net_generic(data->net, nfs_net_id);

	int error;
@@ -666,7 +666,7 @@ static int nfs_init_server(struct nfs_server *server, 
	struct rpc_timeout timeparms;

	struct nfs_client_initdata cl_init = {

		.hostname = ctx->nfs_server.hostname,

		.addr = (const struct sockaddr *)&ctx->nfs_server.address,

		.addr = &ctx->nfs_server._address,

		.addrlen = ctx->nfs_server.addrlen,

		.nfs_mod = ctx->nfs_mod,

		.proto = ctx->nfs_server.protocol,

fs/nfs/delegation.c

+17 −19
Original line number Diff line number Diff line
@@ -228,8 +228,7 @@ static int nfs_delegation_claim_opens(struct inode *inode, 
 *

 */

void nfs_inode_reclaim_delegation(struct inode *inode, const struct cred *cred,

				  fmode_t type,

				  const nfs4_stateid *stateid,

				  fmode_t type, const nfs4_stateid *stateid,

				  unsigned long pagemod_limit)

{

	struct nfs_delegation *delegation;
@@ -239,25 +238,24 @@ void nfs_inode_reclaim_delegation(struct inode *inode, const struct cred *cred, 
	delegation = rcu_dereference(NFS_I(inode)->delegation);

	if (delegation != NULL) {

		spin_lock(&delegation->lock);

		if (nfs4_is_valid_delegation(delegation, 0)) {

		nfs4_stateid_copy(&delegation->stateid, stateid);

		delegation->type = type;

		delegation->pagemod_limit = pagemod_limit;

		oldcred = delegation->cred;

		delegation->cred = get_cred(cred);

			clear_bit(NFS_DELEGATION_NEED_RECLAIM,

				  &delegation->flags);

		clear_bit(NFS_DELEGATION_NEED_RECLAIM, &delegation->flags);

		if (test_and_clear_bit(NFS_DELEGATION_REVOKED,

				       &delegation->flags))

			atomic_long_inc(&nfs_active_delegations);

		spin_unlock(&delegation->lock);

		rcu_read_unlock();

		put_cred(oldcred);

		trace_nfs4_reclaim_delegation(inode, type);

			return;

		}

		/* We appear to have raced with a delegation return. */

		spin_unlock(&delegation->lock);

	}

	} else {

		rcu_read_unlock();

	nfs_inode_set_delegation(inode, cred, type, stateid, pagemod_limit);

		nfs_inode_set_delegation(inode, cred, type, stateid,

					 pagemod_limit);

	}

}



static int nfs_do_return_delegation(struct inode *inode, struct nfs_delegation *delegation, int issync)

fs/nfs/dir.c

+2 −3
Original line number Diff line number Diff line
@@ -2489,7 +2489,6 @@ int nfs_unlink(struct inode *dir, struct dentry *dentry) 
		spin_unlock(&dentry->d_lock);

		goto out;

	}

	if (dentry->d_fsdata)

	/* old devname */

	kfree(dentry->d_fsdata);

	dentry->d_fsdata = NFS_FSDATA_BLOCKED;

fs/nfs/dns_resolve.c

+4 −3
Original line number Diff line number Diff line
@@ -16,8 +16,9 @@ 
#include "dns_resolve.h"



ssize_t nfs_dns_resolve_name(struct net *net, char *name, size_t namelen,

		struct sockaddr *sa, size_t salen)

		struct sockaddr_storage *ss, size_t salen)

{

	struct sockaddr *sa = (struct sockaddr *)ss;

	ssize_t ret;

	char *ip_addr = NULL;

	int ip_len;
@@ -341,7 +342,7 @@ static int do_cache_lookup_wait(struct cache_detail *cd, 
}



ssize_t nfs_dns_resolve_name(struct net *net, char *name,

		size_t namelen, struct sockaddr *sa, size_t salen)

		size_t namelen, struct sockaddr_storage *ss, size_t salen)

{

	struct nfs_dns_ent key = {

		.hostname = name,
@@ -354,7 +355,7 @@ ssize_t nfs_dns_resolve_name(struct net *net, char *name, 
	ret = do_cache_lookup_wait(nn->nfs_dns_resolve, &key, &item);

	if (ret == 0) {

		if (salen >= item->addrlen) {

			memcpy(sa, &item->addr, item->addrlen);

			memcpy(ss, &item->addr, item->addrlen);

			ret = item->addrlen;

		} else

			ret = -EOVERFLOW;

fs/nfs/dns_resolve.h

+1 −1
Original line number Diff line number Diff line
@@ -32,6 +32,6 @@ extern void nfs_dns_resolver_cache_destroy(struct net *net); 
#endif



extern ssize_t nfs_dns_resolve_name(struct net *net, char *name,

		size_t namelen,	struct sockaddr *sa, size_t salen);

		size_t namelen,	struct sockaddr_storage *sa, size_t salen);



#endif