From nobody Thu Nov 12 14:27:40 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 4jQN5S3ztKz70hSt for ; Thu, 12 Nov 2026 14:27:40 +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 4jQN5S35zsz4nWv for ; Thu, 12 Nov 2026 14:27:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794493660; 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=1Ce0+qom76HaUC3nRplqKwHpiObDC7r3mlObYHYiMnU=; b=UNvzPHxGQyC8Z7kKPTBatmrbo1c+CnFBdp2pkl0Mg2LaGF1fre2AZHvWMtA54cOHnu186W LMqmOKLxvwQFlI3Q3qBL2knr1vZVlHQFT/ER5odFFzuTkfyWPSiDEybuZLY5FEjmKoweJT 6Cd5Gf5WaX8+68y7bt2ZXmA0IWdkPhLaNEC3Ft33saCal/z6Z4tD8K3VOCul+ftjXpWf7K sgD1zO3MiZEXaA9tNKhfNhnwajC2LY3hJGRkxVWwI3RmqVcGzevt6ZGGCZLLnmyy9KCAda JV4HH0RXBNrpFGJNLmmVItNC+l5QMA9r7hqrxPlaZPXVGolRtn5YGHakLJPVuA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794493660; b=KnM+BOmkwES4iRzg2pgxvXzgbKilb6SpkZmcEVnNrlQgDxTzjb1oKuWdG8AyiepsrE8ECh 9gOlMnECQ+PZx/fDPlqpcHaT+2ayNUr21rAAQKOPs1vxuDoTctOiGzfVuw3c9llvI3cjXb 1qLFFZxDrznu/fzVk0fe1f6b0b+9REkhwnpnN3IJwcjjdT4osnhK98ftc6jXmRojTOtOkZ GpeJm5ZccmUaHgC5koD9A9lZr8+kRvfGxqOxav2yKWjcYzQMZOulc2N1aYEM8slnk6pFS8 7XLAr4Z75ocnc9bfcfHIz/ac8QR+ViwmtsAWG5tLW3L7B6dtTGEazLP/fnR8Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794493660; 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=1Ce0+qom76HaUC3nRplqKwHpiObDC7r3mlObYHYiMnU=; b=ydidJR2l2uhYXV4KfoTdVuzC4YAgEgf84flzbkqMgqYGRIyEa9oTP1LEIX8UB8JAsOgoxM jHodhtsV9law6Ke1AvfdBxcqSs79dpXluVCKqYbrBLZ8YibKbET6jifln+3oBAPjRjq6wz fNRa7PYUJBCtfDs+a+uZwlww7BkrI10FoecFrZ21n7WExJ9qiVN0Tt7FooNBkIbpKCLSkp 6hxTfXSmC2I4HL0+trLwUvw+2y/h/J5DWlGH1FUW5LtPDamS/peJLp3v1kiRMAKu526Qgn /TybI9c/H0/u5/awHAiw+JUagas5o5yG/IJUFELd0kCZpO+zfMqyVRVYDz4UtQ== 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 4jQN5S2lmsz16Jq for ; Thu, 12 Nov 2026 14:27:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 164bd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Nov 2026 14:27:40 +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: 1a57c6bc8d81 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 1a57c6bc8d81d6eca4f43babde45207e6fda27b9 Auto-Submitted: auto-generated Date: Thu, 12 Nov 2026 14:27:40 +0000 Message-Id: <6af5ccdc.164bd.67d5591b@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=1a57c6bc8d81d6eca4f43babde45207e6fda27b9 commit 1a57c6bc8d81d6eca4f43babde45207e6fda27b9 Author: Dag-Erling Smørgrav AuthorDate: 2026-09-29 12:12:59 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-11-12 14:26:58 +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 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)); } /*