[PATCH v1 09/27] SUNRPC: Convert svcauth_gss_wrap_priv() to use xdr_stream()
From: Chuck Lever <cel@kernel.org>
Date: 2023-01-08 16:29:27
Subsystem:
kernel nfsd, sunrpc, and lockd servers, networking [general], nfs, sunrpc, and lockd clients, the rest · Maintainers:
Chuck Lever, Jeff Layton, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Trond Myklebust, Anna Schumaker, Linus Torvalds
From: Chuck Lever <redacted> Actually xdr_stream does not add value here because of how gss_wrap() works. This is just a clean-up patch. Signed-off-by: Chuck Lever <redacted> --- net/sunrpc/auth_gss/svcauth_gss.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
index cfcd74e6369d..6c49750c0f7a 100644
--- a/net/sunrpc/auth_gss/svcauth_gss.c
+++ b/net/sunrpc/auth_gss/svcauth_gss.c@@ -1830,6 +1830,11 @@ static int svcauth_gss_wrap_integ(struct svc_rqst *rqstp) * unsigned int seq_num; * proc_req_arg_t arg; * }; + * + * gss_wrap() expands the size of the RPC message payload in the + * response buffer. The main purpose of svcauth_gss_wrap_priv() + * is to ensure there is adequate space in the response buffer to + * avoid overflow during the wrap. */ static int svcauth_gss_wrap_priv(struct svc_rqst *rqstp) {
@@ -1847,9 +1852,9 @@ static int svcauth_gss_wrap_priv(struct svc_rqst *rqstp) lenp = p++; offset = (u8 *)p - (u8 *)head->iov_base; - *p++ = htonl(gc->gc_seq); - /* XXX: Would be better to write some xdr helper functions for - * nfs{2,3,4}xdr.c that place the data right, instead of copying: */ + /* Buffer space for this field has already been reserved + * in svcauth_gss_accept(). */ + *p = cpu_to_be32(gc->gc_seq); /* * If there is currently tail data, make sure there is
@@ -1889,8 +1894,8 @@ static int svcauth_gss_wrap_priv(struct svc_rqst *rqstp) if (maj_stat != GSS_S_COMPLETE) goto bad_wrap; - *lenp = htonl(buf->len - offset); - pad = 3 - ((buf->len - offset - 1) & 3); + *lenp = cpu_to_be32(buf->len - offset); + pad = xdr_pad_size(buf->len - offset); p = (__be32 *)(tail->iov_base + tail->iov_len); memset(p, 0, pad); tail->iov_len += pad;