From nobody Sat Nov 07 23:03:22 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 4jMWmw4k2Gz6y0Qw for ; Sat, 07 Nov 2026 23:03:28 +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 4jMWmw0Z2Qz4XVW for ; Sat, 07 Nov 2026 23:03:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794092608; 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=5dysMUoLNUsbMPESeBYU6z6BGI8XAeQbMJMTKAWqlaw=; b=Pg5Sd4fbNT4ZF82nLNDlR9kenLj6uqvGZMQoxrL418VpE7MqgbRs6OCzjBmB+LF84lahtA 3jeKjX8Hm2MPAZVIijG1rAC7tp8WKfVIIyNSaVTFcmUZ2xy0gKR/gw3ZOlWwmgqk2pfl1v 95pLzYdoir1mvliQ3tvRQCScFkRYFApEgiAZA6Bd/VsPHtpdvBcgIpmLFmorX0s+B1xbP5 6mfa1Po0ILa1jh/HMf4qgR0wUVO5MSah4DPFPTkq8LL9VUOORx7Hqxmr24bAYsLUIUASVx MGX4J+DyzOjmhAIgAJusm1uoscvqBcCAaAn2F6hn9YsN4WaXG13RlGXOHONQ8A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794092608; b=tZT69B9zXywo8N3JNgcdgfK5/qbJHN42WYrrOGXIHEpotcaddQoj0cWo4DyXSWOG0OGpTa g3x1Q0IsuHqzsh/2kN2FluvI7EMxO0adg005aqgFfypx6TWrrL4lL1XCwQDUU8UQ2ScKpl cfQpW6Hy8HTbTB/KPyG3dwnscMckatJbRcfRObP8OWyQ/1F+yk0PAiFXF8WsPeInrIhV1V ZX+EH1aG27GHc/6X5nRRquln4AhHJInQK9bATbAbgutim2l+jlFp05Y8YyI3V35tIMUlwD 3jzW7O/PFuo8+oDihAYSFOQjn1Es8qAu5CBpxt9Szym1JzxVipInv0caAzSgTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794092608; 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=5dysMUoLNUsbMPESeBYU6z6BGI8XAeQbMJMTKAWqlaw=; b=enb6fH/sAdR4LvW5nFMBUbu7IvXij1tZjXpkXPsUzQP9xCFvesc/zp8H04lKWJ1SNxP4/L 7VVrXLBG/J499wf9roUqbuz70KPZzkA5p9pOZpM5RxLbmsj4Zzu2w+mGyvNTrDJOhUBkXk Un6LB9BkyfIUwRBBpVsueg6mm7aRj24IumKWBUGq+yljkjdOT58sV+UkJdkAExHRrgQKFO Oi1q+x592gMGU1LKUDqh1GoPB0ZUyQFPnZEoyPP78md10awNvv+oTb+QhXUtxBvCiiy0dY N938H6VQ18vNKbwOXZgTQOf0MZ7vTLjJCBWQ1oxAyOTcOT1ikYDO4oTB/i1nAw== 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 4jMWmw0DWbzj97 for ; Sat, 07 Nov 2026 23:03:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43cd1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 07 Nov 2026 23:03:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 838ff5548b4f - main - xdr: Limit xdr_wrapstring List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/main X-Git-Reftype: branch X-Git-Commit: 838ff5548b4f83707f34cfd28769e35393da3f05 Auto-Submitted: auto-generated Date: Sat, 07 Nov 2026 23:03:22 +0000 Message-Id: <6aefae3a.43cd1.35697757@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=838ff5548b4f83707f34cfd28769e35393da3f05 commit 838ff5548b4f83707f34cfd28769e35393da3f05 Author: Dag-Erling Smørgrav AuthorDate: 2026-11-07 23:02:44 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-11-07 23:03:14 +0000 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 --- lib/libc/xdr/xdr.c | 4 +++- sys/xdr/xdr.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/libc/xdr/xdr.c b/lib/libc/xdr/xdr.c index f8cc5267d350..82f69882a30d 100644 --- a/lib/libc/xdr/xdr.c +++ b/lib/libc/xdr/xdr.c @@ -47,6 +47,8 @@ #include #include +#include +#include #include #include #include "un-namespace.h" @@ -762,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, ~0U)); + return (xdr_string(xdrs, cpp, RPC_MAXDATASIZE)); } /* diff --git a/sys/xdr/xdr.c b/sys/xdr/xdr.c index e012c83104d4..72ffd5ceb76b 100644 --- a/sys/xdr/xdr.c +++ b/sys/xdr/xdr.c @@ -46,6 +46,8 @@ #include #include +#include +#include #include #include @@ -685,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, ~0U)); + return (xdr_string(xdrs, cpp, RPC_MAXDATASIZE)); } /*