From nobody Fri Nov 13 06:07:24 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 4jQmxn3xvkz700XH for ; Fri, 13 Nov 2026 06:07:25 +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 4jQmxn12Cqz4MRv for ; Fri, 13 Nov 2026 06:07:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794550045; 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=wmKeGi7WtveNJk0j89AstK51eUbIqL1YP7eOr1iLuW0=; b=DSNKLm343FXsY2lvFUMdsitUKKm8c3hnNdldpyZlLX/W0AGMSG3VPLTtgW8Lnu/9AqkZti pjKzycpiqHPOgu/LUie2fOifVNBOC4AyqWreic8U82F9sNxzOgtIYISX77/Nbfx5fHxnmM DdC3h71agOX63ik3iSjDPqAzZPPJjnab1r7ZFY3dqujEmApUzjwjoAy0zdCNutHLrNOqTp t3L8RDJ8EYMZfYvjSBW2DHZnTtoDpWShKxXZEofZjPw0g7ucoUF+xqjZV6LgzTzvT7ooIH nuszJXxhCTNra/P/0sjdRAIx3DHCN3REd1OZ5S54FU93G/IqQyZfJOOuArFsMA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794550045; b=w3EpeskxlaoXai20MZpxlS3NE5q6ruXgBmZRMO+t3qIPQiOt7ISLJ3jAsq1XLFhRjRLqe5 l/cGLbVXI8bO3Rnipf7sc87/BCT9lcM09ll3V97obVfYxrJsy2pQHgGLUPmGfjDw29nRnr NHmJtDHaX1+efKJ0ElcuoQfhfn8WYsSCm+oZKRhG+hYOoE46iKMrkBt6jzVUdOdsq/FGJK 2rm2Z+WSTaUW9NekSXRWuE6xx4oL3gLpueGSsxObs0HG9EDvd3/RotgDlTcEFBUbd73jTq gq43gXkjvChYxu+r8TYHUKZyBrOsiCkyOK9iSIYzNDTGLsSeikkOCQvD0sRoIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794550045; 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=wmKeGi7WtveNJk0j89AstK51eUbIqL1YP7eOr1iLuW0=; b=uGlUR7HylI29POnPc/KHTwwMxOvPeP7OB6eb5qAShHUBymBnQKzgl/9T2gbKQ+/MVYC4uF WZai4IDZGacv+kWO06zVmy5s1VFZDJ0SBPyt/IPgrCX3Tp2Y2YZy2cIA3yBIIAoXMg4z8Y aPOjaewWuveA6F4IPhvzjZhZYgYwuKhlp5kzyVgnWidMpG7pnRgmkuL2QZdr7JMNG4PeEQ d+XkXSQ9V13BHSRcp7yrLQMslO1y9iEJlfLqX0sahEgviPOAOkI7P3yvrUiwBfks/eKFNa V8kWOxV0Fj+MPHhsxAQHsECYB5JajemSFM6XGTKfENxBwsldcWvlxhecRxFs9g== 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 4jQmxm73wbzLkK for ; Fri, 13 Nov 2026 06:07:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 10845 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Nov 2026 06:07:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Brooks Davis From: Colin Percival Subject: git: 89090188ab6b - releng/15.2 - xdr_string: don't leak strings with xdr_free 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: 89090188ab6b734927a46cba0124db86b11d2b52 Auto-Submitted: auto-generated Date: Fri, 13 Nov 2026 06:07:24 +0000 Message-Id: <6af6a91c.10845.496cf13@gitrepo.freebsd.org> The branch releng/15.2 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=89090188ab6b734927a46cba0124db86b11d2b52 commit 89090188ab6b734927a46cba0124db86b11d2b52 Author: Brooks Davis AuthorDate: 2026-01-23 10:35:55 +0000 Commit: Colin Percival CommitDate: 2026-11-13 06:07:03 +0000 xdr_string: don't leak strings with xdr_free Historically (and in a small amount of older software such as OpenAFS), developers would attempt to free XDR strings with xdr_free((xdrproc_t)xdr_string, &string) This resulted in xdr_free calling xdr_string with only two intentional arguments and whatever was left in the third argument register. If the register held a sufficently small number, xdr_string would return FALSE and not free the string (no one checks the return values). Software should instead free strings with: xdr_free((xdrproc_t)xdr_wrapstring, &string) Because buggy software exists in the wild, act as though xdr_wrapstring was used in the XDR_FREE case and plug these leaks. Approved by: re (cperciva) Reviewed by: kib MFC after: 3 days Effort: CHERI upstreaming Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D54825 (cherry picked from commit e17d7ab869bbfe3fa5a7da4b74d9f4fa51a0d69f) (cherry picked from commit 204ab270fdcb563160f2f1cedf1822a9ec98a4de) --- lib/libc/xdr/xdr.c | 7 +++++++ sys/xdr/xdr.c | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/lib/libc/xdr/xdr.c b/lib/libc/xdr/xdr.c index 59a843405abf..47aafea4bc30 100644 --- a/lib/libc/xdr/xdr.c +++ b/lib/libc/xdr/xdr.c @@ -696,6 +696,13 @@ xdr_string(XDR *xdrs, char **cpp, u_int maxsize) if (sp == NULL) { return(TRUE); /* already free */ } + /* + * XXX: buggy software may call this without a third + * argument via xdr_free(). Ignore maxsize since it may + * be invalid. Otherwise, if it's very small, we might + * fail to free the string. + */ + maxsize = RPC_MAXDATASIZE; /* FALLTHROUGH */ case XDR_ENCODE: size = strlen(sp); diff --git a/sys/xdr/xdr.c b/sys/xdr/xdr.c index 81d238ebf19f..f983a474abdd 100644 --- a/sys/xdr/xdr.c +++ b/sys/xdr/xdr.c @@ -620,6 +620,13 @@ xdr_string(XDR *xdrs, char **cpp, u_int maxsize) if (sp == NULL) { return(TRUE); /* already free */ } + /* + * XXX: buggy software may call this without a third + * argument via xdr_free(). Ignore maxsize since it may + * be invalid. Otherwise, if it's very small, we might + * fail to free the string. + */ + maxsize = RPC_MAXDATASIZE; /* FALLTHROUGH */ case XDR_ENCODE: size = strlen(sp);