From nobody Mon Jan 26 00:52:34 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 4dzqkq5nTzz6PMlh for ; Mon, 26 Jan 2026 00:52:35 +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 4dzqkq0vjjz3SHy for ; Mon, 26 Jan 2026 00:52:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769388755; 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=im5sN+8DE2GkMoiv+gOIYSVSnQxOMZSMImIdZ3hFBKM=; b=nRCrvm97/rJgomc8EClq+GzubUqWcflPGS00CLVt7CyThdbCNBKn8KwgRyN7dcdadBUdlX swjR1XPwfzupfDCadDknJUeA1M+RG8hlGu3C0QCbFSk4sclxSb/3U1JvrtLeHclG0PgjaM U0OFiSeyRCGGsbVjOTf3ZhDCWrXcqkAkK7Z/TOoHbd3w/9eH/rhy0qleNWMrvAlU7ZLQ4V /Kdk/0YS+teGQd9u6OaU9CtihvCK86oVIET6lVsNHVFxK0REr3Xnxz+tVhKmtLl4sfMhNW S5R4lZPYC4mWGIkcTcvkqDH22JiuPy0HNXy3r+Bm0cW84Ef0tW/iPcqq9jKzWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769388755; 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=im5sN+8DE2GkMoiv+gOIYSVSnQxOMZSMImIdZ3hFBKM=; b=l4VLYOU14THO4bu8McSHWIuvgTolRKJVgCrynqzeXtd8hXsBTHSOZP6aHukLDeMZanoCVm OOCo5wOCVg0I2Fg8JWKae6QDyj/jgb1snQri9yKaPtVabhG7E3NItlcdiPRTqVzO4be/8R W4aoLuyJxnFZBRCfHDZMGkfvwzuu/cu/KCeRT1opC1BgJPG0Jsj3e0lznD0pw+HOonmYKw f09efef3yMRa/y79htI4uax2tx+3F9qtI+py22fLCJOznHc1XQFYtWVHMS+24cI+iJnBJK kVk1Pe6S4WaLjYNAV2kSDmCRxbpBnuo/9P2z4Fw6/Of9A6j4baPAP/6/ubuz/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769388755; a=rsa-sha256; cv=none; b=QI9b4gZ4nYbrIL6qaZJM1BUpwIJOup872wxt7mWzqYV2vVT4WHg58OR17U6WPUf5Vo5meY TzttBu4B95k0TEH8h2vUTUNBVe4xAFhepzfKTOckeIbiTVAERoqyRbFKvrs4HeivCIgtGn d34LVmejdy//Z2jcXZSwjfXCN2ryfr/Av0oTjrVvzFb2MljiqRbfCopg/uf2QLx/ZhZcb/ 8Z8kyRrgFIYRFCR+P/iqoIMI3AtYiwZhWoCGrrh2eCMBWOIx5AeXxZ0NKCCWB24Sx3vO8Y J394B9ELSej6/NnadgZbKDe0TpWrKw7Dr8Sj2D0hnwRLTjy/k1ymdbU/Q/MOxg== 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 4dzqkp73LwzyXN for ; Mon, 26 Jan 2026 00:52:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8928 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 26 Jan 2026 00:52:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 4d9eaa04bde6 - stable/15 - arm64/iommu: Fix a resource leak in smmu_domain_alloc() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4d9eaa04bde65cf6ed19bc801db1f2a28f89639e Auto-Submitted: auto-generated Date: Mon, 26 Jan 2026 00:52:34 +0000 Message-Id: <6976bad2.8928.5a799814@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4d9eaa04bde65cf6ed19bc801db1f2a28f89639e commit 4d9eaa04bde65cf6ed19bc801db1f2a28f89639e Author: Mark Johnston AuthorDate: 2026-01-15 14:04:19 +0000 Commit: Mark Johnston CommitDate: 2026-01-26 00:51:44 +0000 arm64/iommu: Fix a resource leak in smmu_domain_alloc() We should free the allocated ASID if smmu_init_cd() fails. Move the allocation of "domain" to simplify the first error path. Reported by: Kevin Day Reviewed by: br MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54676 (cherry picked from commit 6740cccb1eff2a0e1e6d451fa9676a21736937d2) --- sys/arm64/iommu/smmu.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/arm64/iommu/smmu.c b/sys/arm64/iommu/smmu.c index ec8e04ce117b..a84ef4ae347e 100644 --- a/sys/arm64/iommu/smmu.c +++ b/sys/arm64/iommu/smmu.c @@ -1698,22 +1698,21 @@ smmu_domain_alloc(device_t dev, struct iommu_unit *iommu) unit = (struct smmu_unit *)iommu; - domain = malloc(sizeof(*domain), M_SMMU, M_WAITOK | M_ZERO); - error = smmu_asid_alloc(sc, &new_asid); if (error) { - free(domain, M_SMMU); device_printf(sc->dev, "Could not allocate ASID for a new domain.\n"); return (NULL); } + domain = malloc(sizeof(*domain), M_SMMU, M_WAITOK | M_ZERO); domain->asid = (uint16_t)new_asid; smmu_pmap_pinit(&domain->p); error = smmu_init_cd(sc, domain); if (error) { + smmu_asid_free(sc, domain->asid); free(domain, M_SMMU); device_printf(sc->dev, "Could not initialize CD\n"); return (NULL);