From nobody Thu Nov 12 14:27:41 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 4jQN5T73Wpz70hNX for ; Thu, 12 Nov 2026 14:27:41 +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 4jQN5T5DGVz4nhp for ; Thu, 12 Nov 2026 14:27:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794493661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ThJuboCDQ8+pVggafY+T/p7MCfNyGRj9d68mbgniegM=; b=T6+K9jN62cEPXzeJwqfYdbjc3RvzAw5V02SM6mFTS2O5wLffgwnmJmkz6EYty6eY2nDOLx 5VsrXmx1YXgN1/yxs7UwIf9PgXNXHpt4er00C+WFK+wBy4GCLYcWY5VuTNMt2s0r6ZVxsu 4C8CVIcqBPpFaiqHtKVQh2kbPrhmu7y+P5GiVNKo6jZ44M3I0snkrXnWUnV57ogbB5/r+K 3M/WuTVMXbjx+TFRk0AF/bJCI8XxQd+lZJMVK3U2z+JRjrvdYwyUKXEKbvmROELBlPviUu zVdJ4sVA+AEdTT5IT1p+QjnP7b+PgO2HoLYFB5n0tbLFkpqm1mRu5EE+o6xBvQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794493661; b=p94PMvdrmz3IYYrAd7fHswPY2fqm43/m6jYRZSRI1lldozKNZMIXUwFqIDqzoZpKKjIv2t dAHLvgmIBaHh1HR1uopEvzjuhSDPYLP1/8QS+1WO7F0CtLo4iN+URQrVk8oZJGF/gzK9Iw 3E/ktRPwI/P+VqYNdriBX3PiZ2ASX5Y0B5V/tUL5ADhnDOrxfGVgPfOjvrMIzvamtXRAc4 VTwD7szxTMlgq9SVdZx4nI3lDdAt8BS0/eHIpPBwpnrn8r+A0oPH65jbLAPsK6B4GYfNum rV4u7YdEKjMuL6E+RINhWiOOav7G9oYgeBgUWQ/dpK/2KMJ2hXrB6cit+DDXUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794493661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ThJuboCDQ8+pVggafY+T/p7MCfNyGRj9d68mbgniegM=; b=s5q91mDVxfPy5g3bjU0u99e7fbz5SuSreLFrbw53WhZMf3oAZ050NMQZ5SUQb3HlcXwAow cPByJJwvBdQPABzwRtQztyIwfogoGgZYLNDyg4afoht+53RXky6+eVrEhIm4giJ66Gy50A Kv21C1mqOzCZti7f6h5dFDLnMEt6POy/C0liBo8+h4Yo6e/D0vvzGgEbC2bw25uHlpEQGu BLD+pPQhxcGWEf9IAmr51IMTuqPdsvgHEpMtgMqdaIB9S4UtBo+WDhkoK+nxGL5Q+QB4fl 0O9uOEVXZTNHqRAJKEvknYdxXar2nEVABnfFPed5NECh+m0LSHmFUIj70qmcOg== 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 4jQN5T4TZpz15lc for ; Thu, 12 Nov 2026 14:27:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 154b2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Nov 2026 14:27:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: f741a23d2ef5 - stable/14 - 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f741a23d2ef52567ac41442bdd7ae8e78e8e5803 Auto-Submitted: auto-generated Date: Thu, 12 Nov 2026 14:27:41 +0000 Message-Id: <6af5ccdd.154b2.317e203b@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f741a23d2ef52567ac41442bdd7ae8e78e8e5803 commit f741a23d2ef52567ac41442bdd7ae8e78e8e5803 Author: Dag-Erling Smørgrav AuthorDate: 2026-09-29 12:12:59 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-11-12 14:27:00 +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. Fixes: d2018cedb414 ("xdr: Fix xdr_string") Reported by: bjk@ Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D60898 (cherry picked from commit 838ff5548b4f83707f34cfd28769e35393da3f05) --- 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 599bda6a45a3..79f76fd81cdc 100644 --- a/lib/libc/xdr/xdr.c +++ b/lib/libc/xdr/xdr.c @@ -706,7 +706,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); @@ -768,7 +768,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 d469837d4d1c..39eb94dabffa 100644 --- a/sys/xdr/xdr.c +++ b/sys/xdr/xdr.c @@ -630,7 +630,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); @@ -691,7 +691,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)); } /*