diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2013-01-18 11:33:08 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2014-01-07 16:01:16 -0500 |
| commit | bba0f88bf7c4ad467eeb3a17443de1f9cd0437e0 (patch) | |
| tree | 8372a646ac039ee34d4292042cf523220a37df2c /net | |
| parent | 41ae6e714a6c25a9932d32a323e8c87f6bac4037 (diff) | |
minor svcauth_gss.c cleanup
Diffstat (limited to 'net')
| -rw-r--r-- | net/sunrpc/auth_gss/svcauth_gss.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c index 2a935404047f..0f73f4507746 100644 --- a/net/sunrpc/auth_gss/svcauth_gss.c +++ b/net/sunrpc/auth_gss/svcauth_gss.c | |||
| @@ -1591,8 +1591,7 @@ svcauth_gss_wrap_resp_integ(struct svc_rqst *rqstp) | |||
| 1591 | BUG_ON(integ_len % 4); | 1591 | BUG_ON(integ_len % 4); |
| 1592 | *p++ = htonl(integ_len); | 1592 | *p++ = htonl(integ_len); |
| 1593 | *p++ = htonl(gc->gc_seq); | 1593 | *p++ = htonl(gc->gc_seq); |
| 1594 | if (xdr_buf_subsegment(resbuf, &integ_buf, integ_offset, | 1594 | if (xdr_buf_subsegment(resbuf, &integ_buf, integ_offset, integ_len)) |
| 1595 | integ_len)) | ||
| 1596 | BUG(); | 1595 | BUG(); |
| 1597 | if (resbuf->tail[0].iov_base == NULL) { | 1596 | if (resbuf->tail[0].iov_base == NULL) { |
| 1598 | if (resbuf->head[0].iov_len + RPC_MAX_AUTH_SIZE > PAGE_SIZE) | 1597 | if (resbuf->head[0].iov_len + RPC_MAX_AUTH_SIZE > PAGE_SIZE) |
| @@ -1600,10 +1599,8 @@ svcauth_gss_wrap_resp_integ(struct svc_rqst *rqstp) | |||
| 1600 | resbuf->tail[0].iov_base = resbuf->head[0].iov_base | 1599 | resbuf->tail[0].iov_base = resbuf->head[0].iov_base |
| 1601 | + resbuf->head[0].iov_len; | 1600 | + resbuf->head[0].iov_len; |
| 1602 | resbuf->tail[0].iov_len = 0; | 1601 | resbuf->tail[0].iov_len = 0; |
| 1603 | resv = &resbuf->tail[0]; | ||
| 1604 | } else { | ||
| 1605 | resv = &resbuf->tail[0]; | ||
| 1606 | } | 1602 | } |
| 1603 | resv = &resbuf->tail[0]; | ||
| 1607 | mic.data = (u8 *)resv->iov_base + resv->iov_len + 4; | 1604 | mic.data = (u8 *)resv->iov_base + resv->iov_len + 4; |
| 1608 | if (gss_get_mic(gsd->rsci->mechctx, &integ_buf, &mic)) | 1605 | if (gss_get_mic(gsd->rsci->mechctx, &integ_buf, &mic)) |
| 1609 | goto out_err; | 1606 | goto out_err; |
