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 2835DC54E49 for ; Thu, 7 May 2020 14:32:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F00E9208D6 for ; Thu, 7 May 2020 14:32:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588861929; bh=esUhlF+uB8ANdHPzxeuK+vw4vjfe+BKm5c7xYKPBzco=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=vGQ0RR59HqqBHclCNaOoOQKUg8OgOEIOeQs8/3XG0XOg/FmTu9D5THiUeU8qkyt1c lpCqYBkKd6uTABEwsh3R64a5w3sn8JNhwj6u1j10ZDxn1dxPvICywhyal1SiUgUisG 1KmYMYuYoEa+Qi3EK2Bkv2W8Qv9xIP4DGWrpHEuU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726942AbgEGOaF (ORCPT ); Thu, 7 May 2020 10:30:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:58534 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728743AbgEGOaC (ORCPT ); Thu, 7 May 2020 10:30:02 -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 8FE5024953; Thu, 7 May 2020 14:30:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588861802; bh=esUhlF+uB8ANdHPzxeuK+vw4vjfe+BKm5c7xYKPBzco=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bWiTVCSpaqG0Fh8Bhhrh4O8h+TQPuHi9lr2zpgM6I2s8lxEWDr0jeFQwBtN/7d9ed 30zNHzKJ3yoTUb78yKcbsUemkyTucZ0JgOEdG576eI0bj5KfoB0blapEo4EPmbNuwx L2nwlfu0UWUzb0Ha28btvn3MUP1B7eCjX7bq4WyA= 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.14 16/16] iommu/qcom: Fix local_base status check Date: Thu, 7 May 2020 10:29:43 -0400 Message-Id: <20200507142943.26848-16-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200507142943.26848-1-sashal@kernel.org> References: <20200507142943.26848-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 b08002851e068..920a5df319bc4 100644 --- a/drivers/iommu/qcom_iommu.c +++ b/drivers/iommu/qcom_iommu.c @@ -775,8 +775,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