Attachment 155826 Details for Bug 227726 – patch -- combine several gssapi fixes

[patch] patch -- combine several gssapi fixes

linux-2.6.9-gssapi-cleanup.patch (text/plain), 1.78 KB, created by Jeff Layton on 2007-05-31 16:06:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2007-05-31 16:06:34 UTC

Size: 1.78 KB

patch

obsolete

>commit 016bd7a34f88f4f3cf42aa66e7de46a486835706
>Author: Jeffrey Layton <jlayton@dantu.rdu.redhat.com>
>Date:   Thu May 31 10:13:48 2007 -0400
>
>    BZ#227726: fix oopses in svcauth_gss_release with krb5i
>
>diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
>index 20dbd64..e64192d 100644
>--- a/net/sunrpc/auth_gss/svcauth_gss.c
>+++ b/net/sunrpc/auth_gss/svcauth_gss.c
>@@ -995,19 +995,15 @@ svcauth_gss_release(struct svc_rqst *rqstp)
> 		if (xdr_buf_subsegment(resbuf, &integ_buf, integ_offset,
> 					integ_len))
> 			BUG();
>-		if (resbuf->page_len == 0
>-			&& resbuf->tail[0].iov_len + RPC_MAX_AUTH_SIZE
>-				< PAGE_SIZE) {
>-			BUG_ON(resbuf->tail[0].iov_len);
>-			/* Use head for everything */
>-			resv = &resbuf->head[0];
>-		} else if (resbuf->tail[0].iov_base == NULL) {
>-			/* copied from nfsd4_encode_read */
>-			svc_take_page(rqstp);
>-			resbuf->tail[0].iov_base = page_address(rqstp
>-					->rq_respages[rqstp->rq_resused-1]);
>-			rqstp->rq_restailpage = rqstp->rq_resused-1;
>+		if (resbuf->tail[0].iov_base == NULL) {
>+			if (resbuf->head[0].iov_len + RPC_MAX_AUTH_SIZE
>+					> PAGE_SIZE)
>+				goto out_err;
>+			resbuf->tail[0].iov_base =
>+				resbuf->head[0].iov_base
>+				+ resbuf->head[0].iov_len;
> 			resbuf->tail[0].iov_len = 0;
>+			rqstp->rq_restailpage = 0;
> 			resv = &resbuf->tail[0];
> 		} else {
> 			resv = &resbuf->tail[0];
>diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
>index 5ad2d03..4447482 100644
>--- a/net/sunrpc/svc.c
>+++ b/net/sunrpc/svc.c
>@@ -283,6 +283,7 @@ svc_process(struct svc_serv *serv, struct svc_rqst *rqstp)
> 	rqstp->rq_res.len = 0;
> 	rqstp->rq_res.page_base = 0;
> 	rqstp->rq_res.page_len = 0;
>+	rqstp->rq_res.tail[0].iov_base = NULL;
> 	rqstp->rq_res.tail[0].iov_len = 0;
> 	/* tcp needs a space for the record length... */
> 	if (rqstp->rq_prot == IPPROTO_TCP)

Actions: View | Diff

Attachments on bug 227726: 154924 | 155819 | 155826