From nobody Thu Nov 12 14:27:39 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 4jQN5R6HWmz70hSs for ; Thu, 12 Nov 2026 14:27:39 +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 4jQN5R4PRzz4nct for ; Thu, 12 Nov 2026 14:27:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794493659; 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=cXLe4bJWMiNViCQCWmK8OlXeFk8gk26m/AgboWO+GJ4=; b=GfHJK828MTwvtXUI9MGJqQ27jfgvWdx8YnnQ2+0RmlVCpsp0sop0FJJPCd2Lwiaud/qLTK lNJOI8Qf0gWRMHYDEyJu+WwBDLNCZRMVAk4jGVrEt9OBDRb6/7b0t1iUk2dF9GHaCljai4 PcjNiwA+8+yyzWOhJKewB8dGBN/EJxFeiN7Wd8OH7QIPPfBl9uyiMO7BwXV1oqrr9gOk8I mXnSadH50/sFCA+gaZrJRRYurKeTmviHcAo81JdUtKoTZ/rgx8N7VZCuGVPlQz4z5i1Fto LNlDSK4Sjkfo0rzEFLXHq9puCyIWxxmmjdIa/VwqI2Xr3J7U0iJ32GOMV8qYbg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794493659; b=eUbqwmecChh/RbPQU7tjvCX9VJYkzzwNC5oW6s4ypHKw/IMXwI+cE4atLGwakYZ1qeLZzY kJr1WN37+yiC5PmnmCWbhuGnIQr3SsVZNDgTgTlXTw6Nu1qWuL3IF721Omqcc1bzQrjQec JquqzILUWSQIVI/eNHYVL3xXBcIOc9hTcPKZkDKalBSHbebE9ajYromGneq4di/T42qYSm mvB3EYzmIyOaSnPQGJzuIwVtdXCzkQKRyCYqluFLbhbvHl5Eyh5tLWXt4f4OBQvLDI5Wc4 V82nDA72MW9fSo6yPeZImsV5MxY4gXwfXOPUi8QXy20K60Pc/YD5rStMzkcNLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794493659; 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=cXLe4bJWMiNViCQCWmK8OlXeFk8gk26m/AgboWO+GJ4=; b=kNQ3Gh8PcKx9V2xGy4k+/PeTD7hwa/pbivnDMEGWD3Yj8gNE0DV3T/EQuVS6DYCI1pbPF0 B41j9X8H4N6gb37AyWxN/bpew5pEOrB4lwt4zpqaxbEJCfzTuFrvPR10pSvk2YJmbKolTp rKjHde9KnqRINB3yS4Z1VGBQ6vbDsnht6iveLD70cEH28S9vsP+XavJf64xf4yQDD4xbuG CsRlUrM5xqxAcaGd7tL3zrqSlIeYrqmQEBkEa/JeO9daqEMHCDezyKnJocluhQL0HqPhCy 7r7eDltvR6ayj0KatlqMUfjKETE0Yqc1OvCpMTdH8gAMylN0Q9FfsS2CTx0cQg== 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 4jQN5R2z5kz169X for ; Thu, 12 Nov 2026 14:27:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 157e7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Nov 2026 14:27:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Brooks Davis From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 204ab270fdcb - stable/15 - 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 204ab270fdcb563160f2f1cedf1822a9ec98a4de Auto-Submitted: auto-generated Date: Thu, 12 Nov 2026 14:27:39 +0000 Message-Id: <6af5ccdb.157e7.611203ec@gitrepo.freebsd.org> The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=204ab270fdcb563160f2f1cedf1822a9ec98a4de commit 204ab270fdcb563160f2f1cedf1822a9ec98a4de Author: Brooks Davis AuthorDate: 2026-01-23 10:35:55 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-11-12 14:26:58 +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. 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) --- 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);