On Wed, 15 May 2013 12:47:03 +0800 Libo Chen <clbchenlibo.c...@huawei.com>
wrote:
> It fixes two obvious problems:
> 1. We have registered msm_iommu_driver first, and need unregister it when
> registered msm_iommu_ctx_driver fail
yup, that's a bug.
> 2. We don`t need to kfree drvdata before kzalloc successful
The code's OK at present - kfree(NULL) is legal.
However I suppose the patch cleans things up a little bit, however it
missed a couple of things:
From: Andrew Morton <a...@linux-foundation.org>
Subject: drivers-iommu-msm_iommu_devc-fix-leak-and-invalid-access-fix
remove now-unneeded initialization of ctx_drvdata, remove unneeded braces
Cc: David Brown <dav...@codeaurora.org>
Cc: David Woodhouse <dw...@infradead.org>
Cc: James Hogan <james.ho...@imgtec.com>
Cc: Libo Chen <clbchenlibo.c...@huawei.com>
Cc: Libo Chen <libo.c...@huawei.com>
Signed-off-by: Andrew Morton <a...@linux-foundation.org>
---
drivers/iommu/msm_iommu_dev.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff -puN
drivers/iommu/msm_iommu_dev.c~drivers-iommu-msm_iommu_devc-fix-leak-and-invalid-access-fix
drivers/iommu/msm_iommu_dev.c
---
a/drivers/iommu/msm_iommu_dev.c~drivers-iommu-msm_iommu_devc-fix-leak-and-invalid-access-fix
+++ a/drivers/iommu/msm_iommu_dev.c
@@ -289,22 +289,19 @@ static int msm_iommu_ctx_probe(struct pl
{
struct msm_iommu_ctx_dev *c = pdev->dev.platform_data;
struct msm_iommu_drvdata *drvdata;
- struct msm_iommu_ctx_drvdata *ctx_drvdata = NULL;
+ struct msm_iommu_ctx_drvdata *ctx_drvdata;
int i, ret;
- if (!c || !pdev->dev.parent) {
+
+ if (!c || !pdev->dev.parent)
return -EINVAL;
- }
drvdata = dev_get_drvdata(pdev->dev.parent);
-
- if (!drvdata) {
+ if (!drvdata)
return -ENODEV;
- }
ctx_drvdata = kzalloc(sizeof(*ctx_drvdata), GFP_KERNEL);
- if (!ctx_drvdata) {
+ if (!ctx_drvdata)
return -ENOMEM;
- }
ctx_drvdata->num = c->num;
ctx_drvdata->pdev = pdev;
_
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
