hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
J. Bruce Fields 2006-06-30 01:56:18 -07:00 committed by Linus Torvalds
parent 9ecb6a08d8
commit e142ede8e0
1 changed files with 64 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
net/sunrpc/auth_gss/svcauth_gss.c
View File

@ -1072,8 +1072,8 @@ out:
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: