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 4jQN5S6WfHz70hbp 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 4jQN5S4XDnz4ncx 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:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6gmPll0BnBOr+vo/Ak2mdbhU0wECmZiVPEUl56yEReQ=; b=UyTtJyd4JRJqFiYDhu64LR74qhtgE0crOW8Q8nGhpHdnO+i91N0p798ashfwShwIZinjC1 QQeDNt6hd7EMgd7ByJcfHaWkmLFIsuMET51fQiV5FybuUgXvtqA0IdQCUWSBoR09xKCxCK DhykM7gB//2OhjDXQOEET+Mn/fy62q2Y9si7XC/y+Jb2Ls21h08KQE/6mhNIme9V8uAqRV TSXRY0s9jQCiIMwcS4oqmCA4tZACUlLEZJQb4Sqpge6FBSikdKqVlNFtCVbHhVS6UXghz0 itpyy8xLeUSg74YV8Kf7dFakyrzSOU+H3/CgahDGEC2xrAUJTek58Hdm/OFQmg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794493660; b=lS4pEipr3n1mmDZP0aONI7VCjVhP4ukAhcxv8Xlrcb9zmzqOLiYNvqy54iZ4gQx1RfhHeL KTrinnPEBDQqyHuagaJimQZRT0quxZJq4hbJrEB+GOf59S2OvOBTLZ/OfdWomnH/I0xJCx XCAwkc8WpJ237z9sLWpBp+M2wkWUoFEFIiU3fLU/z2VJcTDcQgifFzlh9aOIiodE4j5vLJ 8GVT6pkcYOZhmFZc/TxKW3m3avjkRcClz9Zok9MqUmmPeo64Iy8Nush6fvuyOJufc2CeSj O2iAIK9Nu+G/rtphD9f0KP59nfmFz9P5VffbPOhCLFSPppOFJK2ed0kBP47feQ== 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:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6gmPll0BnBOr+vo/Ak2mdbhU0wECmZiVPEUl56yEReQ=; b=FapdKed0Yz/MFTgLa7Te82VDvVmek49VbIh3tTQGcJa/gMdNNzEHI1JcVWkCUQwWq311zh XDMo4ZNOY8nOVc2CnVF9uhiFtW8TOCgWHpUJ+G4iFiJt+Ah95bSluKAKJTb8hECkAIA6IN AQlIFmWHEr3l03ld3A4gzg2CeCgXwWpT7Jt19LLHyT7cfFeC8ynUS+4Gp3FNfCk2hQY4Ux F/ajgfLmerEN+KymMI7HknWbFSxlLwbwoAvsWjghxDETNp1WfA8XXcIsKY8m+V0ARG550W JZ3Z9SffUd7l+Id3D6HYsfRnFg4HDBhDyFOXqtIo8CjhOWxLlHfuwMxrejxxkQ== 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 4jQN5S4BJNz15hm 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 165a5 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 Cc: Brooks Davis From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 2d1cf40c92cc - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 2d1cf40c92cc3385d5f9ce7bd1ab86a12a83e325 Auto-Submitted: auto-generated Date: Thu, 12 Nov 2026 14:27:40 +0000 Message-Id: <6af5ccdc.165a5.5e662a84@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=2d1cf40c92cc3385d5f9ce7bd1ab86a12a83e325 commit 2d1cf40c92cc3385d5f9ce7bd1ab86a12a83e325 Author: Brooks Davis AuthorDate: 2026-01-23 10:35:55 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-11-12 14:27:00 +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 bc5e8c542498..599bda6a45a3 100644 --- a/lib/libc/xdr/xdr.c +++ b/lib/libc/xdr/xdr.c @@ -700,6 +700,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 605efd52e3a2..d469837d4d1c 100644 --- a/sys/xdr/xdr.c +++ b/sys/xdr/xdr.c @@ -624,6 +624,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);