From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755348Ab3EVF7s (ORCPT ); Wed, 22 May 2013 01:59:48 -0400 Received: from szxga01-in.huawei.com ([119.145.14.64]:8069 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754065Ab3EVF7q (ORCPT ); Wed, 22 May 2013 01:59:46 -0400 Message-ID: <519C5E8F.7060006@huawei.com> Date: Wed, 22 May 2013 13:58:39 +0800 From: Libo Chen User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20130509 Thunderbird/17.0.6 MIME-Version: 1.0 To: , , CC: LKML , , , , , Subject: Re: [PATCH] msm: iommu: fix leak and invalid access References: <51931347.7020600@huawei.com> In-Reply-To: <51931347.7020600@huawei.com> Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.135.72.158] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ping... On 2013/5/15 12:47, Libo Chen wrote: > > This patch merge two patch that I sended before: > 1. msm: iommu: add missing platform_device_unregister() in err case > 2. msm: iommu: no need kfree before kzalloc successful > > It fixes two obvious problems: > 1. We have registered msm_iommu_driver first, and need unregister it when > registered msm_iommu_ctx_driver fail > > 2. We don`t need to kfree drvdata before kzalloc successful > > Signed-off-by: Libo Chen > --- > drivers/iommu/msm_iommu_dev.c | 11 +++++------ > 1 files changed, 5 insertions(+), 6 deletions(-) > > diff --git a/drivers/iommu/msm_iommu_dev.c b/drivers/iommu/msm_iommu_dev.c > index 8e8fb07..bae0b23 100644 > --- a/drivers/iommu/msm_iommu_dev.c > +++ b/drivers/iommu/msm_iommu_dev.c > @@ -292,22 +292,20 @@ static int msm_iommu_ctx_probe(struct platform_device *pdev) > struct msm_iommu_ctx_drvdata *ctx_drvdata = NULL; > int i, ret; > if (!c || !pdev->dev.parent) { > - ret = -EINVAL; > - goto fail; > + return -EINVAL; > } > > drvdata = dev_get_drvdata(pdev->dev.parent); > > if (!drvdata) { > - ret = -ENODEV; > - goto fail; > + return -ENODEV; > } > > ctx_drvdata = kzalloc(sizeof(*ctx_drvdata), GFP_KERNEL); > if (!ctx_drvdata) { > - ret = -ENOMEM; > - goto fail; > + return -ENOMEM; > } > + > ctx_drvdata->num = c->num; > ctx_drvdata->pdev = pdev; > > @@ -401,6 +399,7 @@ static int __init msm_iommu_driver_init(void) > > ret = platform_driver_register(&msm_iommu_ctx_driver); > if (ret != 0) { > + platform_driver_unregister(&msm_iommu_driver); > pr_err("Failed to register IOMMU context driver\n"); > goto error; > } >