From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AF82857D221 for ; Tue, 8 Sep 2026 17:55:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788890149; cv=none; b=aXe145nkalxAOaNaJGtAAMFQl4TMQ7KbQAOUJHAv+Ab5dUHD25rX8bJpyi8dW2klBvvi/zSEqqvVK21RvsJU9IxmozpT5WJR98CZDtHx6GVQ6XkLB7s8OFxofpkRjDmwZxYNkWiWJBXwhcldZnMHfGg8leI2uSzR1xxYZkHJ+Z4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788890149; c=relaxed/simple; bh=MpR7azB0HPjOBSmJ007SFF7kd/N4z88pCTXsj/f6vZA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BMXROmFWEpb5ZDbKGol/w4Aves9lB1JqPnrTT8gyYeLkEr1pyJwHFmqs2ZzsWGZuXbBbv4S0WZpVb/bGw7aJq9ffaXmJvotR5KVfp5hRDMqXQ8r6YQIYA9U6UsQIR/Ew8mZbeXqJThaXs3mGWNaZlvPCPOT9ttj9OifTfCqgKuw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=h21I52Cq; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="h21I52Cq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 259B41F00AC4; Tue, 8 Sep 2026 17:55:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1788890148; bh=0QYdq6yOYaQrcO13bX9Bnkwb9O86AAMwPZuotVGqWXM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=h21I52CqG5jw+0AM6X3trl7vp3nhIGo014svYIJtk8VYoF4uMnOc0/hXCDfb2rRox mm2p6Z3Pmz/T59FR2VBzAHZyO1T1+92IsnkRASZMg04rzjxmB28pRkpVolsqbHwoFq SloIZge30WdLCe5RHNxCZRbF2vxzig8R4/V3/v/azBtOvsReS+lL7a2T+JjJmcxtkQ 9wa1MgizAyst2W95DTi2ep2Yc0gLb2zW6kAGsU2NvSEf5T+dhsDD/qAssjglIYy7oG 01wMfAD+8u8Ss3EC9R0cdGA/SNPUnGLnH2M7VqYt7wFYRpdJyDb57QML5J0qu+ilr8 eE3UBR2lutopQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Chuck Lever , Jeff Layton , Sasha Levin Subject: [PATCH 6.1.y 2/4] SUNRPC: Rename automatic variables in unwrap_priv_data() Date: Tue, 8 Sep 2026 13:55:43 -0400 Message-ID: <20260908175545.152676-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260908175545.152676-1-sashal@kernel.org> References: <2026090352-custard-sports-0e17@gregkh> <20260908175545.152676-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Chuck Lever [ Upstream commit f4a59e822f8116baf51a9fc86590e4391bd542d2 ] Clean up: To help orient readers, name the stack variables to match the XDR field names. Reviewed-by: Jeff Layton Signed-off-by: Chuck Lever Stable-dep-of: a919c5c88769 ("SUNRPC: svcauth_gss: enforce krb5 token minimum length") Signed-off-by: Sasha Levin --- net/sunrpc/auth_gss/svcauth_gss.c | 38 ++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c index 75749125f2e3d..13ca9621588fe 100644 --- a/net/sunrpc/auth_gss/svcauth_gss.c +++ b/net/sunrpc/auth_gss/svcauth_gss.c @@ -983,16 +983,28 @@ fix_priv_head(struct xdr_buf *buf, int pad) } } +/* + * RFC 2203, Section 5.3.2.3 + * + * struct rpc_gss_priv_data { + * opaque databody_priv<> + * }; + * + * struct rpc_gss_data_t { + * unsigned int seq_num; + * proc_req_arg_t arg; + * }; + */ static int -unwrap_priv_data(struct svc_rqst *rqstp, struct xdr_buf *buf, u32 seq, struct gss_ctx *ctx) +svcauth_gss_unwrap_priv(struct svc_rqst *rqstp, struct xdr_buf *buf, u32 seq, + struct gss_ctx *ctx) { - u32 priv_len, maj_stat; + u32 len, seq_num, maj_stat; int pad, remaining_len, offset; - u32 rseqno; clear_bit(RQ_SPLICE_OK, &rqstp->rq_flags); - priv_len = svc_getnl(&buf->head[0]); + len = svc_getnl(&buf->head[0]); if (rqstp->rq_deferred) { /* Already decrypted last time through! The sequence number * check at out_seq is unnecessary but harmless: */ @@ -1002,14 +1014,14 @@ unwrap_priv_data(struct svc_rqst *rqstp, struct xdr_buf *buf, u32 seq, struct gs * request to the end, where head[0].iov_len is just the bytes * not yet read from the head, so these two values are different: */ remaining_len = total_buf_len(buf); - if (priv_len > remaining_len) + if (len > remaining_len) goto unwrap_failed; - pad = remaining_len - priv_len; + pad = remaining_len - len; buf->len -= pad; fix_priv_head(buf, pad); - maj_stat = gss_unwrap(ctx, 0, priv_len, buf); - pad = priv_len - buf->len; + maj_stat = gss_unwrap(ctx, 0, len, buf); + pad = len - buf->len; /* The upper layers assume the buffer is aligned on 4-byte boundaries. * In the krb5p case, at least, the data ends up offset, so we need to * move it around. */ @@ -1025,8 +1037,8 @@ unwrap_priv_data(struct svc_rqst *rqstp, struct xdr_buf *buf, u32 seq, struct gs if (maj_stat != GSS_S_COMPLETE) goto bad_unwrap; out_seq: - rseqno = svc_getnl(&buf->head[0]); - if (rseqno != seq) + seq_num = svc_getnl(&buf->head[0]); + if (seq_num != seq) goto bad_seqno; return 0; @@ -1034,7 +1046,7 @@ unwrap_priv_data(struct svc_rqst *rqstp, struct xdr_buf *buf, u32 seq, struct gs trace_rpcgss_svc_unwrap_failed(rqstp); return -EINVAL; bad_seqno: - trace_rpcgss_svc_seqno_bad(rqstp, seq, rseqno); + trace_rpcgss_svc_seqno_bad(rqstp, seq, seq_num); return -EINVAL; bad_unwrap: trace_rpcgss_svc_unwrap(rqstp, maj_stat); @@ -1653,8 +1665,8 @@ svcauth_gss_accept(struct svc_rqst *rqstp) /* placeholders for length and seq. number: */ svc_putnl(resv, 0); svc_putnl(resv, 0); - if (unwrap_priv_data(rqstp, &rqstp->rq_arg, - gc->gc_seq, rsci->mechctx)) + if (svcauth_gss_unwrap_priv(rqstp, &rqstp->rq_arg, + gc->gc_seq, rsci->mechctx)) goto garbage_args; rqstp->rq_auth_slack = RPC_MAX_AUTH_SIZE * 2; break; -- 2.53.0