From patchwork Mon May 4 17:57:50 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: 226368 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 1E72DC47258 for ; Mon, 4 May 2020 18:11:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EB59B20663 for ; Mon, 4 May 2020 18:11:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588615880; bh=eYrmYKmh49XGuiEkc+dFDHjKKaw6CeE70yn+6ruH4pE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=TbbXQN9PWBZT+zn8GFQrXf51D8ZOxwp+SBiCpDI9qNJxyvjJFcE7AnZ1D6Yfl7s9U aKyrugK8t4CyNEjemuuUu9EwMvTUzbU7S75n63dzBmc1bYuJq6nw2/ZtNWDf6GNBLy J/lYlfp8X/pocXgoRw/kde7QWw7O75LJO+MS88ko= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731649AbgEDSES (ORCPT ); Mon, 4 May 2020 14:04:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:33672 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731632AbgEDSER (ORCPT ); Mon, 4 May 2020 14:04:17 -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 8D46B20721; Mon, 4 May 2020 18:04:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588615457; bh=eYrmYKmh49XGuiEkc+dFDHjKKaw6CeE70yn+6ruH4pE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WKas+1uK/rkGgDqJPWhMwHJAM0hT4puhGL57+M25+OF4666+uP+bvLzZKngXdog9l sRdIBMW/j1swVfmMa4O/3dcRwAQeFkMtjeUtWQaALl5RmdEeqh0a6ssOldtvmOsTAt i2bdO6ycuc0IkAdtjERvxfuRleEf20J7d4J8E6y4= 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.4 46/57] iommu/qcom: Fix local_base status check Date: Mon, 4 May 2020 19:57:50 +0200 Message-Id: <20200504165500.352054802@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200504165456.783676004@linuxfoundation.org> References: <20200504165456.783676004@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 @@ -814,8 +814,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)) {