|
@@ -1591,8 +1591,7 @@ svcauth_gss_wrap_resp_integ(struct svc_rqst *rqstp)
|
|
|
BUG_ON(integ_len % 4);
|
|
|
*p++ = htonl(integ_len);
|
|
|
*p++ = htonl(gc->gc_seq);
|
|
|
- if (xdr_buf_subsegment(resbuf, &integ_buf, integ_offset,
|
|
|
- integ_len))
|
|
|
+ if (xdr_buf_subsegment(resbuf, &integ_buf, integ_offset, integ_len))
|
|
|
BUG();
|
|
|
if (resbuf->tail[0].iov_base == NULL) {
|
|
|
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)
|
|
|
resbuf->tail[0].iov_base = resbuf->head[0].iov_base
|
|
|
+ resbuf->head[0].iov_len;
|
|
|
resbuf->tail[0].iov_len = 0;
|
|
|
- resv = &resbuf->tail[0];
|
|
|
- } else {
|
|
|
- resv = &resbuf->tail[0];
|
|
|
}
|
|
|
+ resv = &resbuf->tail[0];
|
|
|
mic.data = (u8 *)resv->iov_base + resv->iov_len + 4;
|
|
|
if (gss_get_mic(gsd->rsci->mechctx, &integ_buf, &mic))
|
|
|
goto out_err;
|