From nobody Wed Jul 6 17:05:00 2022 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 4BC111D0C8BE; Wed, 6 Jul 2022 17:05:01 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LdQrr5Tkgz3C7v; Wed, 6 Jul 2022 17:05:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657127100; 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=L6TxBNRdwG5MyI1rQ7kfz+0fVyVHw+MUsNXjpwy9PO4=; b=vj+jTk83Zhssw1iLGj5qBblcxUj1AA5CPGo/0VOfJoJiKXS9ckQTDwg78bW+UT7QwigmlS qmxsrZD3Wv83hgRLzlXqzVVeB8RuDHHkwmfb0JND8RQfHL3oOxAG7e3H8OtUPtVcPA/ucU /qcjjMvi2fI6rBppJEEVmBo20VDC+TSSVpYjwjJUG5IELzv9X+I4KvxsNmyIiYP2/ncJuv AanYVvuZgkEh9cm+y52lVYL8vWs1V8sE3IoW6qZtognE4+0x57KhrwrgmlZp+Zxmify9nq UlxCLzqshaaf7usPbv9TV5c/zDjsv8b6XfHHTjyW+AMs648ntGMLvAyQ5Ie41g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 97ED51E889; Wed, 6 Jul 2022 17:05:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 266H50YC083638; Wed, 6 Jul 2022 17:05:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 266H50vw083637; Wed, 6 Jul 2022 17:05:00 GMT (envelope-from git) Date: Wed, 6 Jul 2022 17:05:00 GMT Message-Id: <202207061705.266H50vw083637@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Moore Subject: git: 4ae24f166c81 - stable/13 - Check if iommu ctx is valid before passing it to functions. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4ae24f166c81c98ce2915d1c7a60bf7ccb89b6fa Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657127100; 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=L6TxBNRdwG5MyI1rQ7kfz+0fVyVHw+MUsNXjpwy9PO4=; b=x7lYg8tGD9Wn2/Kh3AS5h/TGS1NNOIv2g7CG+bLvsHA0kJ+ahTObwpNnZwQbxML6dqxfLE DWAarr9QDvDkkvnucFpJDd8uYYgqEqSQMx39YdPkOhvJXHnR+cJyCEMBGhBuHONnuh+Fxk ebpn0wupjR/2DjDqfs4ANXCkhFJgCCfKR83ruVwHnwbL6dFL71ogaGZCHj1qEC59Rg75jl kwyRYv/nXZtisWDB/PoxRIGwQT+hyoudvvQxZY4hGe9f7pYP58/mDlw0FUSj9kTn2iRTsb iPZ6JtA98KzuEmgYjSO0hJ72uNe5PXqapJJUouLzawZZ3vQSGi7/+LqXLNL5ZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657127100; a=rsa-sha256; cv=none; b=eP2gF78K8deKu1f/dFbpReLX17I08qIRm0SLUSTroIGYum9Qs4NzrJnVZhv9MJKlnt94Rm C2udpJoO9MrPxR+02Je7VWOcRHAOj1rrX9+YTg5+clNN/GcCP2ReS86HkQ2ct+81QMZwTI DoaXJWHQESuEdtNNtyDDfp0A2qmUSiLtk1u0oL5mklF39Au/Grjg6W4rV09lfOoXuPN/QC VKCKXygtKYSo90Xhh9p2jwW+lckNOWdi9MjfWJj3LN+MleDs8PTuY6ut18aihp4HqiuU6R 3cwP1oMuEARo6oYkNbPWPLAT5/cYL68uvLLG/JBKSUCHNAyTifWxs5mqj9jowg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=4ae24f166c81c98ce2915d1c7a60bf7ccb89b6fa commit 4ae24f166c81c98ce2915d1c7a60bf7ccb89b6fa Author: Ruslan Bukin AuthorDate: 2022-05-07 09:27:17 +0000 Commit: Doug Moore CommitDate: 2022-07-06 16:41:03 +0000 Check if iommu ctx is valid before passing it to functions. Differential Revision: https://reviews.freebsd.org/D35130 Sponsored by: UKRI (cherry picked from commit 8b8e56dd5bc781b7d1c7185cd267b0b16a637aa2) --- sys/arm64/arm64/gicv3_its.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/arm64/arm64/gicv3_its.c b/sys/arm64/arm64/gicv3_its.c index 5f78a754b57c..35a5642a95dc 100644 --- a/sys/arm64/arm64/gicv3_its.c +++ b/sys/arm64/arm64/gicv3_its.c @@ -1455,6 +1455,8 @@ gicv3_iommu_init(device_t dev, device_t child, struct iommu_domain **domain) sc = device_get_softc(dev); ctx = iommu_get_dev_ctx(child); + if (ctx == NULL) + return (ENXIO); error = iommu_map_msi(ctx, PAGE_SIZE, GITS_TRANSLATER, IOMMU_MAP_ENTRY_WRITE, IOMMU_MF_CANWAIT, &sc->ma); *domain = iommu_get_ctx_domain(ctx); @@ -1468,6 +1470,9 @@ gicv3_iommu_deinit(device_t dev, device_t child) struct iommu_ctx *ctx; ctx = iommu_get_dev_ctx(child); + if (ctx == NULL) + return; + iommu_unmap_msi(ctx); } #endif