* [PATCH -next] iommu/arm-smmu: fix potential NULL pointer dereference in arm_smmu_map()
@ 2013-11-15 9:45 Wei Yongjun
2013-11-15 12:53 ` Will Deacon
0 siblings, 1 reply; 2+ messages in thread
From: Wei Yongjun @ 2013-11-15 9:45 UTC (permalink / raw)
To: linux-arm-kernel
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
The dereference should be moved below the NULL test.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
drivers/iommu/arm-smmu.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 2349d62..a0cc0a5 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -1420,9 +1420,8 @@ static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova,
phys_addr_t paddr, size_t size, int flags)
{
struct arm_smmu_domain *smmu_domain = domain->priv;
- struct arm_smmu_device *smmu = smmu_domain->leaf_smmu;
- if (!smmu_domain || !smmu)
+ if (!smmu_domain || !smmu_domain->leaf_smmu)
return -ENODEV;
/* Check for silent address truncation up the SMMU chain. */
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH -next] iommu/arm-smmu: fix potential NULL pointer dereference in arm_smmu_map()
2013-11-15 9:45 [PATCH -next] iommu/arm-smmu: fix potential NULL pointer dereference in arm_smmu_map() Wei Yongjun
@ 2013-11-15 12:53 ` Will Deacon
0 siblings, 0 replies; 2+ messages in thread
From: Will Deacon @ 2013-11-15 12:53 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Nov 15, 2013 at 09:45:03AM +0000, Wei Yongjun wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> The dereference should be moved below the NULL test.
>
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> ---
> drivers/iommu/arm-smmu.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
> index 2349d62..a0cc0a5 100644
> --- a/drivers/iommu/arm-smmu.c
> +++ b/drivers/iommu/arm-smmu.c
> @@ -1420,9 +1420,8 @@ static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova,
> phys_addr_t paddr, size_t size, int flags)
> {
> struct arm_smmu_domain *smmu_domain = domain->priv;
> - struct arm_smmu_device *smmu = smmu_domain->leaf_smmu;
>
> - if (!smmu_domain || !smmu)
> + if (!smmu_domain || !smmu_domain->leaf_smmu)
> return -ENODEV;
>
> /* Check for silent address truncation up the SMMU chain. */
I already have a patch for this, but actually, we can remove that check
altogether. I'll fix it in my tree.
Will
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-11-15 12:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-15 9:45 [PATCH -next] iommu/arm-smmu: fix potential NULL pointer dereference in arm_smmu_map() Wei Yongjun
2013-11-15 12:53 ` Will Deacon
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).