From nobody Fri Nov 13 06:07:26 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jQmxp3sF5z700Qc for ; Fri, 13 Nov 2026 06:07:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jQmxp18qtz4MRy for ; Fri, 13 Nov 2026 06:07:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794550046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V3OqOyqhtH1LKCx0sxfwqDUJIk9pBa9I8ju+0gK6GFc=; b=SH8SFNpmvdd3KuixeDwPLuvwWOr2T8acp+EifXe9lkl8igcnkuCwuTYo9sWh46ELlKAwyd ZPObh6lxTeqTlUu1AiYJz8inC2ex1UawZflyHHsKjxajFlk2eEcRGb7BGwYlSYVLDJKHLG Sv9ojbbTaR4YuiU/uLMQuEY3DqqnV11NSdTLiJuEoBDvpJ5c7DaafQTB0PhlEDLqBd7IJ0 fbQHcDMyMsRiAXLUMrs1IDlWAMHnx5fCLHVv2wBARmAe4NuzeApyK2M2vh8c3qzhtq0RNC N2Vhjtok7zD0iD7DgIrvZ8TX1KOBva+lSoPSZ9LSEJ0ZkgBYSWpTrwnwtWbQfQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794550046; b=x5pjVJhvPhVokPHco0a8aY/zIElvQk1MTK+M/FFn7IoWlJx23WzOxg6kPlweCLC4QNH+Wk St7on4u3VBdhzV9mT3X+7s5lsaLNaAgSkgV/2aInrvB7ifjeAK31p0BzgqFUAUOH57nVnZ Szf56kFRvTx4KbXOTAhggByhA8i0O3Pgxu65Du0DTtsJ9Stjx30zQY9rzcOKtLnkFJv1Da 81zBcRxJ1ccdHh1NSgvkJVlnUCVJuhviBEdgCvJ8YEEh/esQmYdF8TcFhlen9vp+X8TBwn wTD6uuAo5XdRn5M62EOLisNxEIqHLrj5eFuWBszNAaUYijh8DYF21PvqCelOGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794550046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V3OqOyqhtH1LKCx0sxfwqDUJIk9pBa9I8ju+0gK6GFc=; b=FgBpafIPBnahQ+PeiYRVxsOFn5yQD/TjU4HildGbOCBnV3b9otopP9ZocGODVhML5giGai pMqi6fH8WQUk7+sgAyFN5PYzf19ZSI6vYX9Fp0xhUeOn8yY/U0/dX6GnRNUKr8xKMJY5lz jtsaNZPtDeP8wO+ItAakXRqwxlD949MuubxG8wgtXXslNqD/VK0eEYmY0+5O6X/1IRWqv5 52nwvdPgccEafXaQNh3U5BomfDEoeFZEjmGSQpeHMlkAAuUYVcBNaO3Xg1+DExEC0u0SGw EQvas1LcKEGJ6dg+IKIH8akeGQ6nST5Mn74QGIHJo7AhUYHqsAKMPFcfpPjq+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jQmxp0YfrzLkM for ; Fri, 13 Nov 2026 06:07:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id eede by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Nov 2026 06:07:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav From: Colin Percival Subject: git: 193586db78ee - releng/15.2 - xdr: Fix xdr_string List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.2 X-Git-Reftype: branch X-Git-Commit: 193586db78eef824fdde210ff6b6f412741df419 Auto-Submitted: auto-generated Date: Fri, 13 Nov 2026 06:07:26 +0000 Message-Id: <6af6a91e.eede.46bcc3c6@gitrepo.freebsd.org> The branch releng/15.2 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=193586db78eef824fdde210ff6b6f412741df419 commit 193586db78eef824fdde210ff6b6f412741df419 Author: Dag-Erling Smørgrav AuthorDate: 2026-09-29 12:12:59 +0000 Commit: Colin Percival CommitDate: 2026-11-13 06:07:09 +0000 xdr: Fix xdr_string Forcing maxsize to RPC_MAXDATASIZE breaks code that deliberately uses XDR with longer strings than permitted by SunRPC. MFC after: 1 week Fixes: 6448ec89e739 (" * limit size of buffers to RPC_MAXDATASIZE") Fixes: e17d7ab869bb ("xdr_string: don't leak strings with xdr_free") Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: kevans, brooks Differential Revision: https://reviews.freebsd.org/D59994 (cherry picked from commit d2018cedb414ef17e77b7fc2fa19fd81328da46b) xdr: Limit xdr_wrapstring The previous commit (re)introduced the possibility that a malicious or corrupt message can cause the receiver to allocate a very large amount of memory before realizing that the message is much shorter than claimed. Revert the change to xdr_wrapstring() to avoid this. Approved by: re (cperciva) Fixes: d2018cedb414 ("xdr: Fix xdr_string") Reported by: bjk@ Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D60898 (cherry picked from commit 838ff5548b4f83707f34cfd28769e35393da3f05) (cherry picked from commit 1a57c6bc8d81d6eca4f43babde45207e6fda27b9) --- lib/libc/xdr/xdr.c | 4 ++-- sys/xdr/xdr.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libc/xdr/xdr.c b/lib/libc/xdr/xdr.c index 47aafea4bc30..82f69882a30d 100644 --- a/lib/libc/xdr/xdr.c +++ b/lib/libc/xdr/xdr.c @@ -702,7 +702,7 @@ xdr_string(XDR *xdrs, char **cpp, u_int maxsize) * be invalid. Otherwise, if it's very small, we might * fail to free the string. */ - maxsize = RPC_MAXDATASIZE; + maxsize = ~0U; /* FALLTHROUGH */ case XDR_ENCODE: size = strlen(sp); @@ -764,7 +764,7 @@ xdr_string(XDR *xdrs, char **cpp, u_int maxsize) bool_t xdr_wrapstring(XDR *xdrs, char **cpp) { - return xdr_string(xdrs, cpp, RPC_MAXDATASIZE); + return (xdr_string(xdrs, cpp, RPC_MAXDATASIZE)); } /* diff --git a/sys/xdr/xdr.c b/sys/xdr/xdr.c index f983a474abdd..72ffd5ceb76b 100644 --- a/sys/xdr/xdr.c +++ b/sys/xdr/xdr.c @@ -626,7 +626,7 @@ xdr_string(XDR *xdrs, char **cpp, u_int maxsize) * be invalid. Otherwise, if it's very small, we might * fail to free the string. */ - maxsize = RPC_MAXDATASIZE; + maxsize = ~0U; /* FALLTHROUGH */ case XDR_ENCODE: size = strlen(sp); @@ -687,7 +687,7 @@ xdr_string(XDR *xdrs, char **cpp, u_int maxsize) bool_t xdr_wrapstring(XDR *xdrs, char **cpp) { - return xdr_string(xdrs, cpp, RPC_MAXDATASIZE); + return (xdr_string(xdrs, cpp, RPC_MAXDATASIZE)); } /*