From patchwork Mon May 4 17:57:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 226389 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 EBE0CC3A5A9 for ; Mon, 4 May 2020 18:09:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C37CE206B8 for ; Mon, 4 May 2020 18:09:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588615746; bh=gGXcu90sfVkJx/BJqDr/e/JHVencP3rdv+IKK6gJMzY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=h/u0X+LMe5AYiUlW6N1X3VD5S25AdnoNLarm8842QpPcebC2x2REhh+Kk2CHZP18T IkiMrL22tdjNTJDqW8wkK4wEA1Noq/nRBuSDLduQ/fkndO9SmTM/wN0dLFGNHMvD4Q xcVx4ek2Vnm7RV+NChz7WIgVaGSLCy1NBIWYsN4M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732083AbgEDSHH (ORCPT ); Mon, 4 May 2020 14:07:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:37686 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732075AbgEDSHD (ORCPT ); Mon, 4 May 2020 14:07:03 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 91BF32073E; Mon, 4 May 2020 18:07:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588615623; bh=gGXcu90sfVkJx/BJqDr/e/JHVencP3rdv+IKK6gJMzY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uCGvCZPr1LbSpvA1JcV13UHkRodhVJWg4To2dd3GPWYL2ylwawVTtvRo1nhPvbppD vF9OecM+Nny9vlY9KsF9mVTAttI3qKscwJzkMMzSaguy0GWhn3ocwjh+Iqg+fit6PZ hUNPzOeq77RwBVmet/BeQO4oGghliSbmrOMsFAgU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tang Bin , Bjorn Andersson , Joerg Roedel Subject: [PATCH 5.6 56/73] iommu/qcom: Fix local_base status check Date: Mon, 4 May 2020 19:57:59 +0200 Message-Id: <20200504165509.536330675@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200504165501.781878940@linuxfoundation.org> References: <20200504165501.781878940@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Tang Bin commit b52649aee6243ea661905bdc5fbe28cc5f6dec76 upstream. 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: Greg Kroah-Hartman --- drivers/iommu/qcom_iommu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/drivers/iommu/qcom_iommu.c +++ b/drivers/iommu/qcom_iommu.c @@ -813,8 +813,11 @@ static int qcom_iommu_device_probe(struc 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)) {