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

Commit e142ede8 authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Linus Torvalds
Browse files

[PATCH] knfsd: svcrpc: Simplify nfsd rpcsec_gss integrity code 



Pull out some of the integrity code into its own function, otherwise
svcauth_gss_release() is going to become very ungainly after the addition of
privacy code.

Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9ecb6a08

net/sunrpc/auth_gss/svcauth_gss.c

+64 −51
Original line number Original line Diff line number Diff line
@@ -1072,8 +1072,8 @@ svcauth_gss_accept(struct svc_rqst *rqstp, u32 *authp) 
	return ret;

	return ret;

}

}





static int

static inline int

svcauth_gss_release(struct svc_rqst *rqstp)

svcauth_gss_wrap_resp_integ(struct svc_rqst *rqstp)

{

{

	struct gss_svc_data *gsd = (struct gss_svc_data *)rqstp->rq_auth_data;

	struct gss_svc_data *gsd = (struct gss_svc_data *)rqstp->rq_auth_data;

	struct rpc_gss_wire_cred *gc = &gsd->clcred;

	struct rpc_gss_wire_cred *gc = &gsd->clcred;
@@ -1085,18 +1085,6 @@ svcauth_gss_release(struct svc_rqst *rqstp) 
	int integ_offset, integ_len;

	int integ_offset, integ_len;

	int stat = -EINVAL;

	int stat = -EINVAL;





	if (gc->gc_proc != RPC_GSS_PROC_DATA)

		goto out;

	/* Release can be called twice, but we only wrap once. */

	if (gsd->body_start == NULL)

		goto out;

	/* normally not set till svc_send, but we need it here: */

	resbuf->len = resbuf->head[0].iov_len

		+ resbuf->page_len + resbuf->tail[0].iov_len;

	switch (gc->gc_svc) {

	case RPC_GSS_SVC_NONE:

		break;

	case RPC_GSS_SVC_INTEGRITY:

	p = gsd->body_start;

	p = gsd->body_start;

	gsd->body_start = NULL;

	gsd->body_start = NULL;

	/* move accept_stat to right place: */

	/* move accept_stat to right place: */
@@ -1124,11 +1112,9 @@ svcauth_gss_release(struct svc_rqst *rqstp) 
		/* Use head for everything */

		/* Use head for everything */

		resv = &resbuf->head[0];

		resv = &resbuf->head[0];

	} else if (resbuf->tail[0].iov_base == NULL) {

	} else if (resbuf->tail[0].iov_base == NULL) {

			if (resbuf->head[0].iov_len + RPC_MAX_AUTH_SIZE

		if (resbuf->head[0].iov_len + RPC_MAX_AUTH_SIZE > PAGE_SIZE)

					> PAGE_SIZE)

			goto out_err;

			goto out_err;

			resbuf->tail[0].iov_base =

		resbuf->tail[0].iov_base = resbuf->head[0].iov_base

				resbuf->head[0].iov_base

						+ resbuf->head[0].iov_len;

						+ resbuf->head[0].iov_len;

		resbuf->tail[0].iov_len = 0;

		resbuf->tail[0].iov_len = 0;

		rqstp->rq_restailpage = 0;

		rqstp->rq_restailpage = 0;
@@ -1146,6 +1132,33 @@ svcauth_gss_release(struct svc_rqst *rqstp) 
	/* not strictly required: */

	/* not strictly required: */

	resbuf->len += XDR_QUADLEN(mic.len) << 2;

	resbuf->len += XDR_QUADLEN(mic.len) << 2;

	BUG_ON(resv->iov_len > PAGE_SIZE);

	BUG_ON(resv->iov_len > PAGE_SIZE);

out:

	stat = 0;

out_err:

	return stat;

}



static int

svcauth_gss_release(struct svc_rqst *rqstp)

{

	struct gss_svc_data *gsd = (struct gss_svc_data *)rqstp->rq_auth_data;

	struct rpc_gss_wire_cred *gc = &gsd->clcred;

	struct xdr_buf *resbuf = &rqstp->rq_res;

	int stat = -EINVAL;



	if (gc->gc_proc != RPC_GSS_PROC_DATA)

		goto out;

	/* Release can be called twice, but we only wrap once. */

	if (gsd->body_start == NULL)

		goto out;

	/* normally not set till svc_send, but we need it here: */

	resbuf->len = resbuf->head[0].iov_len

		+ resbuf->page_len + resbuf->tail[0].iov_len;

	switch (gc->gc_svc) {

	case RPC_GSS_SVC_NONE:

		break;

	case RPC_GSS_SVC_INTEGRITY:

		svcauth_gss_wrap_resp_integ(rqstp);

		break;

		break;

	case RPC_GSS_SVC_PRIVACY:

	case RPC_GSS_SVC_PRIVACY:

	default:

	default: