projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
205757f
)
iommu/qcom: Fix local_base status check
author
Tang Bin
<tangbin@cmss.chinamobile.com>
Sat, 18 Apr 2020 13:47:03 +0000
(21:47 +0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 6 May 2020 06:15:14 +0000
(08:15 +0200)
commit
b52649aee6243ea661905bdc5fbe28cc5f6dec76
upstream.
The function qcom_iommu_device_probe() does not perform sufficient
error checking after executing devm_ioremap_resource(), which can
result in crashes if a critical error path is encountered.
Fixes:
0ae349a0f33f
("iommu/qcom: Add qcom_iommu")
Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link:
https://lore.kernel.org/r/20200418134703.1760-1-tangbin@cmss.chinamobile.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/iommu/qcom_iommu.c
patch
|
blob
|
history
diff --git
a/drivers/iommu/qcom_iommu.c
b/drivers/iommu/qcom_iommu.c
index
e0b3fa2
..
280de92
100644
(file)
--- a/
drivers/iommu/qcom_iommu.c
+++ b/
drivers/iommu/qcom_iommu.c
@@
-814,8
+814,11
@@
static int qcom_iommu_device_probe(struct platform_device *pdev)
qcom_iommu->dev = dev;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (res)
+ if (res)
{
qcom_iommu->local_base = devm_ioremap_resource(dev, res);
+ if (IS_ERR(qcom_iommu->local_base))
+ return PTR_ERR(qcom_iommu->local_base);
+ }
qcom_iommu->iface_clk = devm_clk_get(dev, "iface");
if (IS_ERR(qcom_iommu->iface_clk)) {