From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 54D9CC38A2A for ; Thu, 7 May 2020 14:33:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 36C482073A for ; Thu, 7 May 2020 14:33:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588861987; bh=yjK0K18/yKGNc2Fe44IN8aGXKpjykOVM6YYbZaoJKEo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iwBy7cpeAWxrNi7pjwi+PHnc10cWVBFOqbeF5jYEjInJwmdRmB9Jk7Fubuxk7Cnas 6AWINALch+QWsZYxayPan8UNbvefVapYrIUtZWG/hJrCDTzpK8Wl/BZ6mV+XTsDoQi IPin3AiqVp2LkfeslrlV3/bnjlMLQTjm7jQrd3ck= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728710AbgEGOdA (ORCPT ); Thu, 7 May 2020 10:33:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:57642 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728636AbgEGO3l (ORCPT ); Thu, 7 May 2020 10:29:41 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 971D524955; Thu, 7 May 2020 14:29:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588861781; bh=yjK0K18/yKGNc2Fe44IN8aGXKpjykOVM6YYbZaoJKEo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sG/KrzW91pjBPcp5RrupX/nD8BxVE8O5Va0XMPgvc3d+1A679wR9Ellc6H6iBixqd Y51SbK6aYgcICdj+yHVM2WAk3ItLvoas7FlWGvzuRVnodW+QF6y5JrYRs9zJzpZ/Lu Dd7YBQu1hM5V3b3BMtozxpKyk5+5mp8TjMn59Tjw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tang Bin , Bjorn Andersson , Joerg Roedel , Sasha Levin , linux-arm-msm@vger.kernel.org, iommu@lists.linux-foundation.org Subject: [PATCH AUTOSEL 4.19 20/20] iommu/qcom: Fix local_base status check Date: Thu, 7 May 2020 10:29:16 -0400 Message-Id: <20200507142917.26612-20-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200507142917.26612-1-sashal@kernel.org> References: <20200507142917.26612-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Tang Bin [ Upstream commit b52649aee6243ea661905bdc5fbe28cc5f6dec76 ] 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 Reviewed-by: Bjorn Andersson Link: https://lore.kernel.org/r/20200418134703.1760-1-tangbin@cmss.chinamobile.com Signed-off-by: Joerg Roedel Signed-off-by: Sasha Levin --- drivers/iommu/qcom_iommu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/qcom_iommu.c b/drivers/iommu/qcom_iommu.c index 9a6ed5eeaad16..b0a4a3d2f60ea 100644 --- a/drivers/iommu/qcom_iommu.c +++ b/drivers/iommu/qcom_iommu.c @@ -797,8 +797,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)) { -- 2.20.1