From patchwork Thu Jul 6 09:37:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivek Gautam X-Patchwork-Id: 9827799 X-Patchwork-Delegate: sboyd@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F130060317 for ; Thu, 6 Jul 2017 09:37:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E1E9B283C0 for ; Thu, 6 Jul 2017 09:37:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D626F28504; Thu, 6 Jul 2017 09:37:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6DAF1283C0 for ; Thu, 6 Jul 2017 09:37:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752258AbdGFJh2 (ORCPT ); Thu, 6 Jul 2017 05:37:28 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:33234 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751011AbdGFJh0 (ORCPT ); Thu, 6 Jul 2017 05:37:26 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 4D26760723; Thu, 6 Jul 2017 09:37:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1499333845; bh=nC0mbMvDiMO+kDQOSpcSiUeb0A5EqAXrvfhtUvsPV4M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QDgmx1B3A3ZtRZHFJM5kGPEsRPDC4xsDzUBLbSAs5xaCgUAtCULdr6Y+MIXkSFjqN /0ntLVx83CFGamEjla7u5sUU99nCeSnEUPqewZC9UYKZOfA2fHi1BIWarau5LY8ppS 6fzsNllfy2ilM59SrFQnCOESoLB543xBSbPd8a3Q= Received: from blr-ubuntu-41.ap.qualcomm.com (blr-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.18.19]) (using TLSv1.1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: vivek.gautam@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id BE43B60723; Thu, 6 Jul 2017 09:37:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1499333844; bh=nC0mbMvDiMO+kDQOSpcSiUeb0A5EqAXrvfhtUvsPV4M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=boIqqXQwZo8Ap8okgqpTMVFIU9swQxUtBR+/dKAbyZZFjviaUmFeo4/Vp2NsR3yFB NTF4cVxFrw0n84QjzOBV8rkbQ0ZBH2yZDXfFPlPka9L+5aIe/ublSsHRVbxBJVMsKh Wt+F2nfaEvjMmCd7l5wBAeDgLVS7dmUI2rum/iSQ= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org BE43B60723 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=vivek.gautam@codeaurora.org From: Vivek Gautam To: joro@8bytes.org, robin.murphy@arm.com, robh+dt@kernel.org, mark.rutland@arm.com, will.deacon@arm.com, m.szyprowski@samsung.com, sboyd@codeaurora.org, robdclark@gmail.com, iommu@lists.linux-foundation.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org Cc: linux-arm-msm@vger.kernel.org, sricharan@codeaurora.org, stanimir.varbanov@linaro.org, architt@codeaurora.org, vivek.gautam@codeaurora.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH V4 1/6] iommu/arm-smmu: Fix the error path in arm_smmu_add_device Date: Thu, 6 Jul 2017 15:07:00 +0530 Message-Id: <1499333825-7658-2-git-send-email-vivek.gautam@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1499333825-7658-1-git-send-email-vivek.gautam@codeaurora.org> References: <1499333825-7658-1-git-send-email-vivek.gautam@codeaurora.org> Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP fwspec->iommu_priv is available only after arm_smmu_master_cfg instance has been allocated. We shouldn't free it before that. Also it's logical to free the master cfg itself without checking for fwspec. Signed-off-by: Vivek Gautam --- drivers/iommu/arm-smmu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 9a45117d90de..61b1f8729a7c 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -1349,15 +1349,15 @@ static int arm_smmu_add_device(struct device *dev) ret = arm_smmu_master_alloc_smes(dev); if (ret) - goto out_free; + goto out_cfg_free; iommu_device_link(&smmu->iommu, dev); return 0; +out_cfg_free: + kfree(cfg); out_free: - if (fwspec) - kfree(fwspec->iommu_priv); iommu_fwspec_free(dev); return ret; }