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

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

Merge branch 'for-2.6.40' of git://linux-nfs.org/~bfields/linux 

* 'for-2.6.40' of git://linux-nfs.org/~bfields/linux: (22 commits)
  nfsd: make local functions static
  NFSD: Remove unused variable from nfsd4_decode_bind_conn_to_session()
  NFSD: Check status from nfsd4_map_bcts_dir()
  NFSD: Remove setting unused variable in nfsd_vfs_read()
  nfsd41: error out on repeated RECLAIM_COMPLETE
  nfsd41: compare request's opcnt with session's maxops at nfsd4_sequence
  nfsd v4.1 lOCKT clientid field must be ignored
  nfsd41: add flag checking for create_session
  nfsd41: make sure nfs server process OPEN with EXCLUSIVE4_1 correctly
  nfsd4: fix wrongsec handling for PUTFH + op cases
  nfsd4: make fh_verify responsibility of nfsd_lookup_dentry caller
  nfsd4: introduce OPDESC helper
  nfsd4: allow fh_verify caller to skip pseudoflavor checks
  nfsd: distinguish functions of NFSD_MAY_* flags
  svcrpc: complete svsk processing on cb receive failure
  svcrpc: take advantage of tcp autotuning
  SUNRPC: Don't wait for full record to receive tcp data
  svcrpc: copy cb reply instead of pages
  svcrpc: close connection if client sends short packet
  svcrpc: note network-order types in svc_process_calldir
  ...
parents b11b06d9 c47d832b

fs/nfsd/export.c

+0 −6
Original line number Diff line number Diff line
@@ -1354,12 +1354,6 @@ exp_pseudoroot(struct svc_rqst *rqstp, struct svc_fh *fhp) 
	if (IS_ERR(exp))

		return nfserrno(PTR_ERR(exp));

	rv = fh_compose(fhp, exp, exp->ex_path.dentry, NULL);

	if (rv)

		goto out;

	rv = check_nfsd_access(exp, rqstp);

	if (rv)

		fh_put(fhp);

out:

	exp_put(exp);

	return rv;

}

fs/nfsd/nfs3proc.c

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ nfsd3_proc_create(struct svc_rqst *rqstp, struct nfsd3_createargs *argp, 
	}



	/* Now create the file and set attributes */

	nfserr = nfsd_create_v3(rqstp, dirfhp, argp->name, argp->len,

	nfserr = do_nfsd_create(rqstp, dirfhp, argp->name, argp->len,

				attr, newfhp,

				argp->createmode, argp->verf, NULL, NULL);

fs/nfsd/nfs3xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -842,7 +842,7 @@ compose_entry_fh(struct nfsd3_readdirres *cd, struct svc_fh *fhp, 
	return rv;

}



__be32 *encode_entryplus_baggage(struct nfsd3_readdirres *cd, __be32 *p, const char *name, int namlen)

static __be32 *encode_entryplus_baggage(struct nfsd3_readdirres *cd, __be32 *p, const char *name, int namlen)

{

	struct svc_fh	fh;

	int err;

fs/nfsd/nfs4proc.c

+65 −8
Original line number Diff line number Diff line
@@ -196,9 +196,9 @@ do_open_lookup(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_o 


		/*

		 * Note: create modes (UNCHECKED,GUARDED...) are the same

		 * in NFSv4 as in v3.

		 * in NFSv4 as in v3 except EXCLUSIVE4_1.

		 */

		status = nfsd_create_v3(rqstp, current_fh, open->op_fname.data,

		status = do_nfsd_create(rqstp, current_fh, open->op_fname.data,

					open->op_fname.len, &open->op_iattr,

					&resfh, open->op_createmode,

					(u32 *)open->op_verf.data,
@@ -403,7 +403,7 @@ nfsd4_putfh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	cstate->current_fh.fh_handle.fh_size = putfh->pf_fhlen;

	memcpy(&cstate->current_fh.fh_handle.fh_base, putfh->pf_fhval,

	       putfh->pf_fhlen);

	return fh_verify(rqstp, &cstate->current_fh, 0, NFSD_MAY_NOP);

	return fh_verify(rqstp, &cstate->current_fh, 0, NFSD_MAY_BYPASS_GSS);

}



static __be32
@@ -762,6 +762,9 @@ nfsd4_secinfo(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	__be32 err;



	fh_init(&resfh, NFS4_FHSIZE);

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

	if (err)

		return err;

	err = nfsd_lookup_dentry(rqstp, &cstate->current_fh,

				    secinfo->si_name, secinfo->si_namelen,

				    &exp, &dentry);
@@ -986,6 +989,9 @@ enum nfsd4_op_flags { 
	ALLOWED_WITHOUT_FH = 1 << 0,	/* No current filehandle required */

	ALLOWED_ON_ABSENT_FS = 1 << 1,	/* ops processed on absent fs */

	ALLOWED_AS_FIRST_OP = 1 << 2,	/* ops reqired first in compound */

	/* For rfc 5661 section 2.6.3.1.1: */

	OP_HANDLES_WRONGSEC = 1 << 3,

	OP_IS_PUTFH_LIKE = 1 << 4,

};



struct nfsd4_operation {
@@ -1031,6 +1037,44 @@ static __be32 nfs41_check_op_ordering(struct nfsd4_compoundargs *args) 
	return nfs_ok;

}



static inline struct nfsd4_operation *OPDESC(struct nfsd4_op *op)

{

	return &nfsd4_ops[op->opnum];

}



static bool need_wrongsec_check(struct svc_rqst *rqstp)

{

	struct nfsd4_compoundres *resp = rqstp->rq_resp;

	struct nfsd4_compoundargs *argp = rqstp->rq_argp;

	struct nfsd4_op *this = &argp->ops[resp->opcnt - 1];

	struct nfsd4_op *next = &argp->ops[resp->opcnt];

	struct nfsd4_operation *thisd;

	struct nfsd4_operation *nextd;



	thisd = OPDESC(this);

	/*

	 * Most ops check wronsec on our own; only the putfh-like ops

	 * have special rules.

	 */

	if (!(thisd->op_flags & OP_IS_PUTFH_LIKE))

		return false;

	/*

	 * rfc 5661 2.6.3.1.1.6: don't bother erroring out a

	 * put-filehandle operation if we're not going to use the

	 * result:

	 */

	if (argp->opcnt == resp->opcnt)

		return false;



	nextd = OPDESC(next);

	/*

	 * Rest of 2.6.3.1.1: certain operations will return WRONGSEC

	 * errors themselves as necessary; others should check for them

	 * now:

	 */

	return !(nextd->op_flags & OP_HANDLES_WRONGSEC);

}



/*

 * COMPOUND call.

 */
@@ -1108,7 +1152,7 @@ nfsd4_proc_compound(struct svc_rqst *rqstp, 
			goto encode_op;

		}



		opdesc = &nfsd4_ops[op->opnum];

		opdesc = OPDESC(op);



		if (!cstate->current_fh.fh_dentry) {

			if (!(opdesc->op_flags & ALLOWED_WITHOUT_FH)) {
@@ -1126,6 +1170,9 @@ nfsd4_proc_compound(struct svc_rqst *rqstp, 
		else

			BUG_ON(op->status == nfs_ok);



		if (!op->status && need_wrongsec_check(rqstp))

			op->status = check_nfsd_access(cstate->current_fh.fh_export, rqstp);



encode_op:

		/* Only from SEQUENCE */

		if (resp->cstate.status == nfserr_replay_cache) {
@@ -1217,10 +1264,12 @@ static struct nfsd4_operation nfsd4_ops[] = { 
	},

	[OP_LOOKUP] = {

		.op_func = (nfsd4op_func)nfsd4_lookup,

		.op_flags = OP_HANDLES_WRONGSEC,

		.op_name = "OP_LOOKUP",

	},

	[OP_LOOKUPP] = {

		.op_func = (nfsd4op_func)nfsd4_lookupp,

		.op_flags = OP_HANDLES_WRONGSEC,

		.op_name = "OP_LOOKUPP",

	},

	[OP_NVERIFY] = {
@@ -1229,6 +1278,7 @@ static struct nfsd4_operation nfsd4_ops[] = { 
	},

	[OP_OPEN] = {

		.op_func = (nfsd4op_func)nfsd4_open,

		.op_flags = OP_HANDLES_WRONGSEC,

		.op_name = "OP_OPEN",

	},

	[OP_OPEN_CONFIRM] = {
@@ -1241,17 +1291,20 @@ static struct nfsd4_operation nfsd4_ops[] = { 
	},

	[OP_PUTFH] = {

		.op_func = (nfsd4op_func)nfsd4_putfh,

		.op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,

		.op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS

				| OP_IS_PUTFH_LIKE,

		.op_name = "OP_PUTFH",

	},

	[OP_PUTPUBFH] = {

		.op_func = (nfsd4op_func)nfsd4_putrootfh,

		.op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,

		.op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS

				| OP_IS_PUTFH_LIKE,

		.op_name = "OP_PUTPUBFH",

	},

	[OP_PUTROOTFH] = {

		.op_func = (nfsd4op_func)nfsd4_putrootfh,

		.op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,

		.op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS

				| OP_IS_PUTFH_LIKE,

		.op_name = "OP_PUTROOTFH",

	},

	[OP_READ] = {
@@ -1281,15 +1334,18 @@ static struct nfsd4_operation nfsd4_ops[] = { 
	},

	[OP_RESTOREFH] = {

		.op_func = (nfsd4op_func)nfsd4_restorefh,

		.op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,

		.op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS

				| OP_IS_PUTFH_LIKE,

		.op_name = "OP_RESTOREFH",

	},

	[OP_SAVEFH] = {

		.op_func = (nfsd4op_func)nfsd4_savefh,

		.op_flags = OP_HANDLES_WRONGSEC,

		.op_name = "OP_SAVEFH",

	},

	[OP_SECINFO] = {

		.op_func = (nfsd4op_func)nfsd4_secinfo,

		.op_flags = OP_HANDLES_WRONGSEC,

		.op_name = "OP_SECINFO",

	},

	[OP_SETATTR] = {
@@ -1353,6 +1409,7 @@ static struct nfsd4_operation nfsd4_ops[] = { 
	},

	[OP_SECINFO_NO_NAME] = {

		.op_func = (nfsd4op_func)nfsd4_secinfo_no_name,

		.op_flags = OP_HANDLES_WRONGSEC,

		.op_name = "OP_SECINFO_NO_NAME",

	},

};

fs/nfsd/nfs4state.c

+33 −9
Original line number Diff line number Diff line
@@ -1519,6 +1519,9 @@ nfsd4_create_session(struct svc_rqst *rqstp, 
	bool confirm_me = false;

	int status = 0;



	if (cr_ses->flags & ~SESSION4_FLAG_MASK_A)

		return nfserr_inval;



	nfs4_lock_state();

	unconf = find_unconfirmed_client(&cr_ses->clientid);

	conf = find_confirmed_client(&cr_ses->clientid);
@@ -1637,8 +1640,9 @@ __be32 nfsd4_bind_conn_to_session(struct svc_rqst *rqstp, 
		return nfserr_badsession;



	status = nfsd4_map_bcts_dir(&bcts->dir);

	if (!status)

		nfsd4_new_conn(rqstp, cstate->session, bcts->dir);

	return nfs_ok;

	return status;

}



static bool nfsd4_compound_in_session(struct nfsd4_session *session, struct nfs4_sessionid *sid)
@@ -1725,6 +1729,13 @@ static void nfsd4_sequence_check_conn(struct nfsd4_conn *new, struct nfsd4_sessi 
	return;

}



static bool nfsd4_session_too_many_ops(struct svc_rqst *rqstp, struct nfsd4_session *session)

{

	struct nfsd4_compoundargs *args = rqstp->rq_argp;



	return args->opcnt > session->se_fchannel.maxops;

}



__be32

nfsd4_sequence(struct svc_rqst *rqstp,

	       struct nfsd4_compound_state *cstate,
@@ -1753,6 +1764,10 @@ nfsd4_sequence(struct svc_rqst *rqstp, 
	if (!session)

		goto out;



	status = nfserr_too_many_ops;

	if (nfsd4_session_too_many_ops(rqstp, session))

		goto out;



	status = nfserr_badslot;

	if (seq->slotid >= session->se_fchannel.maxreqs)

		goto out;
@@ -1808,6 +1823,8 @@ nfsd4_sequence(struct svc_rqst *rqstp, 
__be32

nfsd4_reclaim_complete(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, struct nfsd4_reclaim_complete *rc)

{

	int status = 0;



	if (rc->rca_one_fs) {

		if (!cstate->current_fh.fh_dentry)

			return nfserr_nofilehandle;
@@ -1817,9 +1834,14 @@ nfsd4_reclaim_complete(struct svc_rqst *rqstp, struct nfsd4_compound_state *csta 
		 */

		 return nfs_ok;

	}



	nfs4_lock_state();

	if (is_client_expired(cstate->session->se_client)) {

		nfs4_unlock_state();

	status = nfserr_complete_already;

	if (cstate->session->se_client->cl_firststate)

		goto out;



	status = nfserr_stale_clientid;

	if (is_client_expired(cstate->session->se_client))

		/*

		 * The following error isn't really legal.

		 * But we only get here if the client just explicitly
@@ -1827,11 +1849,13 @@ nfsd4_reclaim_complete(struct svc_rqst *rqstp, struct nfsd4_compound_state *csta 
		 * error it gets back on an operation for the dead

		 * client.

		 */

		return nfserr_stale_clientid;

	}

		goto out;



	status = nfs_ok;

	nfsd4_create_clid_dir(cstate->session->se_client);

out:

	nfs4_unlock_state();

	return nfs_ok;

	return status;

}



__be32
@@ -2462,7 +2486,7 @@ find_delegation_file(struct nfs4_file *fp, stateid_t *stid) 
	return NULL;

}



int share_access_to_flags(u32 share_access)

static int share_access_to_flags(u32 share_access)

{

	share_access &= ~NFS4_SHARE_WANT_MASK;
@@ -2882,7 +2906,7 @@ nfsd4_renew(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	return status;

}



struct lock_manager nfsd4_manager = {

static struct lock_manager nfsd4_manager = {

};



static void