From nobody Fri Apr 24 17:55:49 2026 X-Original-To: dev-commits-src-branches@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 4g2LGs6W6Jz6ZxGm for ; Fri, 24 Apr 2026 17:55:49 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2LGs4QZLz3py2 for ; Fri, 24 Apr 2026 17:55:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777053349; 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=Bhl7h6VJko/scO52WkekwKNYaYRg/HdEGMbkw/nOrNQ=; b=RQER0MDNtlNqsqY3Db6NG+uVwOYTKsSCSATwtU3VN44HcgJwfxotJcmqW6uS/oBxwgyrV+ Dtan3+INQzIHJqKuQ0JS0g22Y0nhxzJeGpkCpbguzEN2q2h9GZ6/J/2ZQrvHQV1oSkfhht YvqQMWBDtgsEXptfMVvFGWuv8LOjOeGh8GqJnJBSQoA7GsCzT+EbmreBzRc9S216FBiSec HN0JY7Uen+/4QRf+PNvZM62ZZKoCa+yx2oBxflgyYXYszfeZKFuRwrqEUg7DMgcx+RNdE1 4BRjvjIJq34fDZzeW3zA+w3AFGI+iftA0Xyh8FkbQgOlyR4rznJHjRfKnEI99A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777053349; a=rsa-sha256; cv=none; b=J+AgHQDGd9NE7HnHTZidTPdkNoYo1tIxaFQCMqXv6eahDglsLbkGPYWfeuSfNCCuXpgvDy v84t2rPvCKZGDoHssjxi932dCe2KR0VCr+fSrbQP2GQ33EcMsyzNWDj54UQXnvtRQjS6+d ne+prFq9p5Xk+HdpxD4v9PJOjwdT7POBs8KtPG7eLypkQWYmTjNr7k0Pp2j4H3LAiGxIBv 9HgGaQRRN9/ASW9Xpf8ltNqZsB/wezfyjKmawnupNE9hi0jL8RaqYHTs/OGFxF/w+AHvtW pOwzBOdSgHVeqdt80EB9xSgQ+T9gXXwKBjpKp89YaiQITt/0eTHPUnSlKqFCGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777053349; 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=Bhl7h6VJko/scO52WkekwKNYaYRg/HdEGMbkw/nOrNQ=; b=JXBVW0BMjFA9jQPUzNEVYLH7LKlZKcjIFRvw9tgPEet5+tmbKNlNUh9g0aC4oagSrfYYbN y5B3G2zzEmlfehPZb04cZ6e6c0xfNNj58QbihPyK6yZVEk4VadjyaJT3hjuAdgZ+lVikOJ ZmR03/qFmojJs0eM7Vb1Eg4fEJe8+bWWOLpNQ1rn9+g2e+Co++Sdw59Y5J5s31/J9bybCF a9KMMxSNR1MKNz4kWoOoqYcE0lFEcka7w55SbNF4poAvpboZtAXHK7WZl1bcd90mYM8IBc IB+iTTClvBkiFf8l3wOHFrdgxo6LljjTBmWYAfGAGapgx69JQ7N8347BQ21P1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2LGs3lQ0z1CLx for ; Fri, 24 Apr 2026 17:55:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e6e6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 24 Apr 2026 17:55:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: b339a4a042f9 - stable/15 - spibus: Don't leak KVA when freeing a mmap region List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b339a4a042f97cb5bb334f5551703cc5a475af18 Auto-Submitted: auto-generated Date: Fri, 24 Apr 2026 17:55:49 +0000 Message-Id: <69ebaea5.1e6e6.4caa12c0@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b339a4a042f97cb5bb334f5551703cc5a475af18 commit b339a4a042f97cb5bb334f5551703cc5a475af18 Author: John Baldwin AuthorDate: 2026-02-06 15:30:26 +0000 Commit: John Baldwin CommitDate: 2026-04-24 15:32:19 +0000 spibus: Don't leak KVA when freeing a mmap region Effort: CHERI upstreaming Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D54837 (cherry picked from commit 06fd19b5349a1ff27ef338619fdade596986fc2f) --- sys/dev/spibus/spigen.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/spibus/spigen.c b/sys/dev/spibus/spigen.c index 66c93e927281..39b94c6123fc 100644 --- a/sys/dev/spibus/spigen.c +++ b/sys/dev/spibus/spigen.c @@ -283,8 +283,10 @@ spigen_mmap_cleanup(void *arg) { struct spigen_mmap *mmap = arg; - if (mmap->kvaddr != 0) + if (mmap->kvaddr != 0) { pmap_qremove(mmap->kvaddr, mmap->bufsize / PAGE_SIZE); + kva_free(mmap->kvaddr, mmap->bufsize); + } if (mmap->bufobj != NULL) vm_object_deallocate(mmap->bufobj); free(mmap, M_DEVBUF);