Commit 5b1e167d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfsd-4.6' of git://linux-nfs.org/~bfields/linux 

Pull nfsd updates from Bruce Fields:
 "Various bugfixes, a RDMA update from Chuck Lever, and support for a
  new pnfs layout type from Christoph Hellwig.  The new layout type is a
  variant of the block layout which uses SCSI features to offer improved
  fencing and device identification.

  (Also: note this pull request also includes the client side of SCSI
  layout, with Trond's permission.)"

* tag 'nfsd-4.6' of git://linux-nfs.org/~bfields/linux:
  sunrpc/cache: drop reference when sunrpc_cache_pipe_upcall() detects a race
  nfsd: recover: fix memory leak
  nfsd: fix deadlock secinfo+readdir compound
  nfsd4: resfh unused in nfsd4_secinfo
  svcrdma: Use new CQ API for RPC-over-RDMA server send CQs
  svcrdma: Use new CQ API for RPC-over-RDMA server receive CQs
  svcrdma: Remove close_out exit path
  svcrdma: Hook up the logic to return ERR_CHUNK
  svcrdma: Use correct XID in error replies
  svcrdma: Make RDMA_ERROR messages work
  rpcrdma: Add RPCRDMA_HDRLEN_ERR
  svcrdma: svc_rdma_post_recv() should close connection on error
  svcrdma: Close connection when a send error occurs
  nfsd: Lower NFSv4.1 callback message size limit
  svcrdma: Do not send Write chunk XDR pad with inline content
  svcrdma: Do not write xdr_buf::tail in a Write chunk
  svcrdma: Find client-provided write and reply chunks once per reply
  nfsd: Update NFS server comments related to RDMA support
  nfsd: Fix a memory leak when meeting unsupported state_protect_how4
  nfsd4: fix bad bounds checking
parents 8b97be05 a6ab1e81

fs/nfsd/nfs4proc.c

+1 −2
Original line number Diff line number Diff line
@@ -864,12 +864,10 @@ static __be32 
nfsd4_secinfo(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,

	      struct nfsd4_secinfo *secinfo)

{

	struct svc_fh resfh;

	struct svc_export *exp;

	struct dentry *dentry;

	__be32 err;



	fh_init(&resfh, NFS4_FHSIZE);

	err = fh_verify(rqstp, &cstate->current_fh, S_IFDIR, NFSD_MAY_EXEC);

	if (err)

		return err;
@@ -878,6 +876,7 @@ nfsd4_secinfo(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
				    &exp, &dentry);

	if (err)

		return err;

	fh_unlock(&cstate->current_fh);

	if (d_really_is_negative(dentry)) {

		exp_put(exp);

		err = nfserr_noent;

fs/nfsd/nfs4recover.c

+1 −0
Original line number Diff line number Diff line
@@ -1266,6 +1266,7 @@ nfsd4_umh_cltrack_init(struct net *net) 
	/* XXX: The usermode helper s not working in container yet. */

	if (net != &init_net) {

		pr_warn("NFSD: attempt to initialize umh client tracking in a container ignored.\n");

		kfree(grace_start);

		return -EINVAL;

	}

fs/nfsd/nfs4state.c

+17 −12
Original line number Diff line number Diff line
@@ -2408,7 +2408,8 @@ nfsd4_exchange_id(struct svc_rqst *rqstp, 
	default:				/* checked by xdr code */

		WARN_ON_ONCE(1);

	case SP4_SSV:

		return nfserr_encr_alg_unsupp;

		status = nfserr_encr_alg_unsupp;

		goto out_nolock;

	}



	/* Cases below refer to rfc 5661 section 18.35.4: */
@@ -2586,21 +2587,26 @@ static __be32 check_forechannel_attrs(struct nfsd4_channel_attrs *ca, struct nfs 
	return nfs_ok;

}



/*

 * Server's NFSv4.1 backchannel support is AUTH_SYS-only for now.

 * These are based on similar macros in linux/sunrpc/msg_prot.h .

 */

#define RPC_MAX_HEADER_WITH_AUTH_SYS \

	(RPC_CALLHDRSIZE + 2 * (2 + UNX_CALLSLACK))



#define RPC_MAX_REPHEADER_WITH_AUTH_SYS \

	(RPC_REPHDRSIZE + (2 + NUL_REPLYSLACK))



#define NFSD_CB_MAX_REQ_SZ	((NFS4_enc_cb_recall_sz + \

				 RPC_MAX_HEADER_WITH_AUTH) * sizeof(__be32))

				 RPC_MAX_HEADER_WITH_AUTH_SYS) * sizeof(__be32))

#define NFSD_CB_MAX_RESP_SZ	((NFS4_dec_cb_recall_sz + \

				 RPC_MAX_REPHEADER_WITH_AUTH) * sizeof(__be32))

				 RPC_MAX_REPHEADER_WITH_AUTH_SYS) * \

				 sizeof(__be32))



static __be32 check_backchannel_attrs(struct nfsd4_channel_attrs *ca)

{

	ca->headerpadsz = 0;



	/*

	 * These RPC_MAX_HEADER macros are overkill, especially since we

	 * don't even do gss on the backchannel yet.  But this is still

	 * less than 1k.  Tighten up this estimate in the unlikely event

	 * it turns out to be a problem for some client:

	 */

	if (ca->maxreq_sz < NFSD_CB_MAX_REQ_SZ)

		return nfserr_toosmall;

	if (ca->maxresp_sz < NFSD_CB_MAX_RESP_SZ)
@@ -2710,10 +2716,9 @@ nfsd4_create_session(struct svc_rqst *rqstp, 
		goto out_free_conn;

	}

	status = nfs_ok;

	/*

	 * We do not support RDMA or persistent sessions

	 */

	/* Persistent sessions are not supported */

	cr_ses->flags &= ~SESSION4_PERSIST;

	/* Upshifting from TCP to RDMA is not supported */

	cr_ses->flags &= ~SESSION4_RDMA;



	init_session(rqstp, new, conf, cr_ses);

fs/nfsd/nfs4xdr.c

+9 −6
Original line number Diff line number Diff line
@@ -1072,8 +1072,9 @@ nfsd4_decode_rename(struct nfsd4_compoundargs *argp, struct nfsd4_rename *rename 


	READ_BUF(4);

	rename->rn_snamelen = be32_to_cpup(p++);

	READ_BUF(rename->rn_snamelen + 4);

	READ_BUF(rename->rn_snamelen);

	SAVEMEM(rename->rn_sname, rename->rn_snamelen);

	READ_BUF(4);

	rename->rn_tnamelen = be32_to_cpup(p++);

	READ_BUF(rename->rn_tnamelen);

	SAVEMEM(rename->rn_tname, rename->rn_tnamelen);
@@ -1155,13 +1156,14 @@ nfsd4_decode_setclientid(struct nfsd4_compoundargs *argp, struct nfsd4_setclient 
	READ_BUF(8);

	setclientid->se_callback_prog = be32_to_cpup(p++);

	setclientid->se_callback_netid_len = be32_to_cpup(p++);



	READ_BUF(setclientid->se_callback_netid_len + 4);

	READ_BUF(setclientid->se_callback_netid_len);

	SAVEMEM(setclientid->se_callback_netid_val, setclientid->se_callback_netid_len);

	READ_BUF(4);

	setclientid->se_callback_addr_len = be32_to_cpup(p++);



	READ_BUF(setclientid->se_callback_addr_len + 4);

	READ_BUF(setclientid->se_callback_addr_len);

	SAVEMEM(setclientid->se_callback_addr_val, setclientid->se_callback_addr_len);

	READ_BUF(4);

	setclientid->se_callback_ident = be32_to_cpup(p++);



	DECODE_TAIL;
@@ -1835,8 +1837,9 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp) 


	READ_BUF(4);

	argp->taglen = be32_to_cpup(p++);

	READ_BUF(argp->taglen + 8);

	READ_BUF(argp->taglen);

	SAVEMEM(argp->tag, argp->taglen);

	READ_BUF(8);

	argp->minorversion = be32_to_cpup(p++);

	argp->opcnt = be32_to_cpup(p++);

	max_reply += 4 + (XDR_QUADLEN(argp->taglen) << 2);
@@ -3060,7 +3063,7 @@ static __be32 nfsd4_encode_bind_conn_to_session(struct nfsd4_compoundres *resp, 
		p = xdr_encode_opaque_fixed(p, bcts->sessionid.data,

						NFS4_MAX_SESSIONID_LEN);

		*p++ = cpu_to_be32(bcts->dir);

		/* Sorry, we do not yet support RDMA over 4.1: */

		/* Upshifting from TCP to RDMA is not supported */

		*p++ = cpu_to_be32(0);

	}

	return nfserr;

include/linux/sunrpc/auth.h

+7 −0
Original line number Diff line number Diff line
@@ -20,11 +20,18 @@ 
#include <linux/uidgid.h>

#include <linux/utsname.h>



/*

 * Maximum size of AUTH_NONE authentication information, in XDR words.

 */

#define NUL_CALLSLACK	(4)

#define NUL_REPLYSLACK	(2)



/*

 * Size of the nodename buffer. RFC1831 specifies a hard limit of 255 bytes,

 * but Linux hostnames are actually limited to __NEW_UTS_LEN bytes.

 */

#define UNX_MAXNODENAME	__NEW_UTS_LEN

#define UNX_CALLSLACK	(21 + XDR_QUADLEN(UNX_MAXNODENAME))



struct rpcsec_gss_info;

CRA Git | Maintained and supported by SUSTech CRA and CCSE