From: Rob Clark <robdclark@chromium.org>
To: Xiyu Yang <xiyuyang19@fudan.edu.cn>
Cc: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>,
LKML <linux-kernel@vger.kernel.org>,
Will Deacon <will@kernel.org>, Joerg Roedel <joro@8bytes.org>,
yuanxzhang@fudan.edu.cn, iommu@lists.linux-foundation.org,
Jordan Crouse <jordan@cosmicpenguin.net>,
Xin Tan <tanxin.ctf@gmail.com>, Jon Hunter <jonathanh@nvidia.com>,
Robin Murphy <robin.murphy@arm.com>,
"moderated list:ARM64 PORT \(AARCH64 ARCHITECTURE\)"
<linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH v2] iommu/arm-smmu: Fix arm_smmu_device refcount leak in address translation
Date: Thu, 10 Jun 2021 15:28:15 -0700 [thread overview]
Message-ID: <CAJs_Fx6qgQFOp16SLQfz-Aaj4mqTo+vCvfpQr_E3UapVTrsu6Q@mail.gmail.com> (raw)
In-Reply-To: <1623293391-17261-1-git-send-email-xiyuyang19@fudan.edu.cn>
On Wed, Jun 9, 2021 at 7:50 PM Xiyu Yang <xiyuyang19@fudan.edu.cn> wrote:
>
> The reference counting issue happens in several exception handling paths
> of arm_smmu_iova_to_phys_hard(). When those error scenarios occur, the
> function forgets to decrease the refcount of "smmu" increased by
> arm_smmu_rpm_get(), causing a refcount leak.
>
> Fix this issue by jumping to "out" label when those error scenarios
> occur.
>
> Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
> Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
> ---
> drivers/iommu/arm/arm-smmu/arm-smmu.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c b/drivers/iommu/arm/arm-smmu/arm-smmu.c
> index 6f72c4d208ca..3a3847277320 100644
> --- a/drivers/iommu/arm/arm-smmu/arm-smmu.c
> +++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c
> @@ -1271,6 +1271,7 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,
> u64 phys;
> unsigned long va, flags;
> int ret, idx = cfg->cbndx;
> + phys_addr_t addr = 0;
>
> ret = arm_smmu_rpm_get(smmu);
> if (ret < 0)
> @@ -1290,6 +1291,7 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,
> dev_err(dev,
> "iova to phys timed out on %pad. Falling back to software table walk.\n",
> &iova);
> + arm_smmu_rpm_put(smmu);
> return ops->iova_to_phys(ops, iova);
I suppose you could also:
addr = ops->iov_to_phys(...);
goto out;
but either way,
Reviewed-by: Rob Clark <robdclark@chromium.org>
> }
>
> @@ -1298,12 +1300,14 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,
> if (phys & ARM_SMMU_CB_PAR_F) {
> dev_err(dev, "translation fault!\n");
> dev_err(dev, "PAR = 0x%llx\n", phys);
> - return 0;
> + goto out;
> }
>
> + addr = (phys & GENMASK_ULL(39, 12)) | (iova & 0xfff);
> +out:
> arm_smmu_rpm_put(smmu);
>
> - return (phys & GENMASK_ULL(39, 12)) | (iova & 0xfff);
> + return addr;
> }
>
> static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain,
> --
> 2.7.4
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-06-10 22:28 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-10 2:49 [PATCH v2] iommu/arm-smmu: Fix arm_smmu_device refcount leak in address translation Xiyu Yang
2021-06-10 22:28 ` Rob Clark [this message]
2021-06-11 16:15 ` Will Deacon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAJs_Fx6qgQFOp16SLQfz-Aaj4mqTo+vCvfpQr_E3UapVTrsu6Q@mail.gmail.com \
--to=robdclark@chromium.org \
--cc=iommu@lists.linux-foundation.org \
--cc=jonathanh@nvidia.com \
--cc=jordan@cosmicpenguin.net \
--cc=joro@8bytes.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robin.murphy@arm.com \
--cc=saiprakash.ranjan@codeaurora.org \
--cc=tanxin.ctf@gmail.com \
--cc=will@kernel.org \
--cc=xiyuyang19@fudan.edu.cn \
--cc=yuanxzhang@fudan.edu.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).