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 180DE2C237E; Sat, 12 Sep 2026 15:32:50 +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=1789227171; cv=none; b=JLp13Sbt21Hqw9AnsasZU9E4ggRTG1AIkuQ6o01MQstSv12C9hfheAnq3ueB10lG+yQrBzw+vaIqz9MfT5qnTAi5hd+YdfoOaBCV9lI/OnTzQCwX5wSFq6fBtU0skqWtrM4xyXTcYsQD7fxvvaB6GZ1yaAmwGIluJFAXlvLeT8c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789227171; c=relaxed/simple; bh=tXuDhEL76RBzJGq1/x2+VZuoqCbay4YszFcogZ7wcHg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZaXlVn2iC8hIIeywZC5cpV5SzjL367lqoSYyHY9K5F+sd0PrT3XnBmeZLG9zUH2lL7cSrgZ/bSEp8MLMvk39PGuGKMc9KtaSajlUL8hiR2W0Anyj+Y596oIGV2PeLS5QNXmDRwMG8wkxr7rE1GoGKLHzcZNbJ1oWQmAj3pdmeq8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=RoCljfsi; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="RoCljfsi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1BC2C1F000FF; Sat, 12 Sep 2026 15:32:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789227170; bh=hYiU6OB3AJDVxH7g3SnZeI6Nh8nHz99llraxXm27E3U=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RoCljfsixeLGdlLD7N4qlY67tCKiE7rSrMSWa2G/+HBbXn9ZsAhXVSHqm/mycqvOa sI8GD559EV4B+odVvp134xduRHV10ui2qHUdwTGgzqjeXLrXXQXG0BZWv6QHw5XHVa 2jwslcjnb298B5swMugfKsjTzjIWacUo3Nau5qDo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Chris Mason , Jeff Layton , Chuck Lever Subject: [PATCH 6.1 0126/1191] SUNRPC: xdr_buf_trim: clamp buf->len to avoid underflow Date: Sat, 12 Sep 2026 08:47:34 +0200 Message-ID: <20260912065551.023636601@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065548.086904252@linuxfoundation.org> References: <20260912065548.086904252@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chris Mason commit 3f491306dcb673ff5e78e1044ba450c58978774e upstream. xdr_buf_trim() trims `len` bytes from the tail of an xdr_buf by walking the tail, pages, and head iovecs. Each per-section step uses min_t() so it never removes more bytes than that section holds, but the final accounting at the fix_len label subtracts the total bytes actually consumed from buf->len without any clamp: fix_len: buf->len -= (len - trim); When the caller has set buf->len to a value smaller than the sum of the iov_lens, (len - trim) can exceed buf->len and the unsigned subtraction wraps to near UINT_MAX. gss_krb5_unwrap_v2() reaches xdr_buf_trim() in exactly that state: buf->head[0].iov_len -= GSS_KRB5_TOK_HDR_LEN + headskip; buf->len = len - (GSS_KRB5_TOK_HDR_LEN + headskip); xdr_buf_trim(buf, ec + GSS_KRB5_TOK_HDR_LEN + tailskip); buf->len is a small wire-derived value while the iov_lens are at page scale, so the per-section loops legitimately consume far more bytes than buf->len records. The wrapped buf->len then propagates as the authoritative stream bound into every downstream XDR decoder. Fix by clamping the decrement so buf->len bottoms out at zero: buf->len -= min_t(unsigned int, buf->len, len - trim); On the normal path where the iov_lens sum to buf->len, (len - trim) is always <= buf->len and the result is identical to before. No callers change behavior outside the underflow case. Fixes: 4c190e2f913f ("sunrpc: trim off trailing checksum before returning decrypted or integrity authenticated buffer") Cc: stable@vger.kernel.org Assisted-by: kres (claude-opus-4-7) Signed-off-by: Chris Mason Reviewed-by: Jeff Layton Link: https://patch.msgid.link/20260524010213.557424-4-cel@kernel.org Signed-off-by: Chuck Lever Signed-off-by: Greg Kroah-Hartman --- net/sunrpc/xdr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/sunrpc/xdr.c +++ b/net/sunrpc/xdr.c @@ -1785,7 +1785,7 @@ void xdr_buf_trim(struct xdr_buf *buf, u trim -= cur; } fix_len: - buf->len -= (len - trim); + buf->len -= min_t(unsigned int, buf->len, len - trim); } EXPORT_SYMBOL_GPL(xdr_buf_trim);