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 191B2C433E0 for ; Thu, 28 May 2020 12:09:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E00D821548 for ; Thu, 28 May 2020 12:09:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590667764; bh=+8PAQumLNMOPEAjYCtJadvmFe6vCUWYN4D2zbv03ne4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1FQp7HPfas+++H2iLsOqL8ZxxJCRSfxFs42OeGQwOEOU4fGH8Ogu0DyrINbdBI6ZK fLftisi62cNSLYKbKNQTClYFRnJroVmHBli+1Q/167wdImbd+ep33VmX/lbN1nQ2X8 7rHAu04bIfUsF5r//XpADMOl5dNechnr6j97e2oQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389127AbgE1MJV (ORCPT ); Thu, 28 May 2020 08:09:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:48692 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388752AbgE1L4c (ORCPT ); Thu, 28 May 2020 07:56:32 -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 B5BC821534; Thu, 28 May 2020 11:56:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590666991; bh=+8PAQumLNMOPEAjYCtJadvmFe6vCUWYN4D2zbv03ne4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aBN/bjSJ1cvIrUJnpBFGev57u3s9ooHV25MPDL4Yp0kan8NuafSGiu2dRIJtwSu65 w/jpQAYnV0ggAch2A1j9gK2K9U47m6n8QPH7BlJkoEGdGgn7wtAnCrg52tBgwp1AuA jVTYJdE//J9HcOcSQrk9ReRQA/K/Lt7CAZtdXhQc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tang Bin , Zhang Shengju , "David S . Miller" , Sasha Levin , linux-mips@linux-mips.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.6 27/47] net: sgi: ioc3-eth: Fix return value check in ioc3eth_probe() Date: Thu, 28 May 2020 07:55:40 -0400 Message-Id: <20200528115600.1405808-27-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200528115600.1405808-1-sashal@kernel.org> References: <20200528115600.1405808-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tang Bin [ Upstream commit a7654211d0ffeaa8eb0545ea00f8445242cbce05 ] In the function devm_platform_ioremap_resource(), if get resource failed, the return value is ERR_PTR() not NULL. Thus it must be replaced by IS_ERR(), or else it may result in crashes if a critical error path is encountered. Fixes: 0ce5ebd24d25 ("mfd: ioc3: Add driver for SGI IOC3 chip") Signed-off-by: Zhang Shengju Signed-off-by: Tang Bin Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/sgi/ioc3-eth.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/sgi/ioc3-eth.c b/drivers/net/ethernet/sgi/ioc3-eth.c index db6b2988e632..f4895777f5e3 100644 --- a/drivers/net/ethernet/sgi/ioc3-eth.c +++ b/drivers/net/ethernet/sgi/ioc3-eth.c @@ -865,14 +865,14 @@ static int ioc3eth_probe(struct platform_device *pdev) ip = netdev_priv(dev); ip->dma_dev = pdev->dev.parent; ip->regs = devm_platform_ioremap_resource(pdev, 0); - if (!ip->regs) { - err = -ENOMEM; + if (IS_ERR(ip->regs)) { + err = PTR_ERR(ip->regs); goto out_free; } ip->ssram = devm_platform_ioremap_resource(pdev, 1); - if (!ip->ssram) { - err = -ENOMEM; + if (IS_ERR(ip->ssram)) { + err = PTR_ERR(ip->ssram); goto out_free; } -- 2.25.1