From: Chris Wright Subject: [patch 18/69] knfsd: rpc: fix server-side wrapping of krb5i replies Date: Mon, 21 May 2007 12:16:30 -0700 Message-ID: <20070521191714.531390000@sous-sol.org> References: <20070521191612.800400000@sous-sol.org> Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , torvalds@linux-foundation.org, alan@lxorguk.ukuu.org.uk, NeilBrown , "J. Bruce Fields" , nfs@lists.sourceforge.net To: linux-kernel@vger.kernel.org, stable@kernel.org, Andrew Morton Return-path: Sender: linux-kernel-owner@vger.kernel.org List-ID: -stable review patch. If anyone has any objections, please let us know. --------------------- From: NeilBrown It's not necessarily correct to assume that the xdr_buf used to hold the server's reply must have page data whenever it has tail data. And there's no need for us to deal with that case separately anyway. Acked-by: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Chris Wright --- net/sunrpc/auth_gss/svcauth_gss.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff .prev/net/sunrpc/auth_gss/svcauth_gss.c ./net/sunrpc/auth_gss/svcauth_gss.c --- linux-2.6.21.1.orig/net/sunrpc/auth_gss/svcauth_gss.c +++ linux-2.6.21.1/net/sunrpc/auth_gss/svcauth_gss.c @@ -1196,13 +1196,7 @@ svcauth_gss_wrap_resp_integ(struct svc_r if (xdr_buf_subsegment(resbuf, &integ_buf, integ_offset, integ_len)) BUG(); - if (resbuf->page_len == 0 - && resbuf->head[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) { + 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 --