From nobody Fri Jan 23 11:07:28 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 4dyFWh4TcDz6Q22s for ; Fri, 23 Jan 2026 11:07: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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dyFWh1rHXz3Y4b for ; Fri, 23 Jan 2026 11:07:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769166448; 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=Q0oSXconJfFs7ECQ58/EnjDEjbGo2Kvp320wwMhPzg0=; b=Ul/0k3js4vn+0lNJWOucsFxbwJQffjSRFqggPwe1ZTRfPNmYWLPFEoIM6YaTBD8vqcH3LS fjxkNijNsZJ1uW4l+vuPcwWWhZYb9jml72exH4tlbFqo4g0H4GzrLodBslqLc5VnHzo5Cv GcV8RKgj49hn2toELzd1m95NEAN4lXXvYJMVhV99qEv3DRa+Fdz9Y+lLd1jn4/d2TF4ydS o4PKVfDLIeWe0BhH2UxdTretVOL3aZrhhdlHbTAHYPjy7M7jk0uCzsei+3s7YZILUJKd5H 2502QGwr50xmLGCNbH6zJWnhFoq34XK3c3H41CPtCmY3VpRdvzkIHFbJ9r+M9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769166448; 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=Q0oSXconJfFs7ECQ58/EnjDEjbGo2Kvp320wwMhPzg0=; b=m9l+eXf9lcmY4M/oERkyybR+E8zKBNVvze6KEC5C+CC+O54u1saWWaKVrmISbQWcBw3Ln3 +qfCYKwTuwIrHneQJPih7i5jFEQ2CcNX8p75mqrXreAjepPGicHnKEwvlv/mu8xpFJZ4y5 ttqWlYb3+PmBuciH7X12HlK2xPSWVJDExUsFIhuK3fhBxaJlwqZXLLNCP1NAC3MerAXSnV 9yLKbxv8SCKvm1msfKOcSTUW4sN8CiQMI5LnRdqeSP6mPlBe/VhN8P8eEDODRKx1SwWvxP tdS5Tp7Aj/nZu65xdKS5vNj0jC+oVSbQQ0w3YoQamVcP/S9OzBpd51Cugdr2Lg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769166448; a=rsa-sha256; cv=none; b=Ifg2UYQXxf5JFWwQyMb7qit3kOdr2+JcpSPzCwtuvEITA8EOUGk240D2inXvshHGG4+FPu vHUsttUxFJGboMRhyD2ElSUc6LFN5QCa51AHsBsJbOxvK9y/ez1yfQ4y91Usv3mqryIh+N VwpbJg6pyuz4h28xbA467L67YN610jfGzWYRCoz1cKmH1Y3FYGvtQF9KwkjtskRRxaH5mq WH3mXYkEJKpCEJKgEaaOUaoWyi5RV8qI+VYMszyToy4lz8VjhbUkZr1x9ztwLJE5lxvfYI 2d84D+pcToQLHgHx0lDx7BD7RyyW+HZ2hKXpdCjQyU5HsEyAlN9aBT4xW3RgrA== 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 4dyFWh0vsSz1Y2 for ; Fri, 23 Jan 2026 11:07:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a7ab by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 23 Jan 2026 11:07:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: e17d7ab869bb - main - xdr_string: don't leak strings with xdr_free List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e17d7ab869bbfe3fa5a7da4b74d9f4fa51a0d69f Auto-Submitted: auto-generated Date: Fri, 23 Jan 2026 11:07:28 +0000 Message-Id: <69735670.3a7ab.5637ae5a@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=e17d7ab869bbfe3fa5a7da4b74d9f4fa51a0d69f commit e17d7ab869bbfe3fa5a7da4b74d9f4fa51a0d69f Author: Brooks Davis AuthorDate: 2026-01-23 10:35:55 +0000 Commit: Brooks Davis CommitDate: 2026-01-23 10:35:55 +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 --- 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);