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=-16.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, 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 2EE2CC11F75 for ; Tue, 6 Jul 2021 12:02:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1AFAA620E2 for ; Tue, 6 Jul 2021 12:02:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242640AbhGFMCq (ORCPT ); Tue, 6 Jul 2021 08:02:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:47546 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237374AbhGFLgH (ORCPT ); Tue, 6 Jul 2021 07:36:07 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B0CC561EFB; Tue, 6 Jul 2021 11:27:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625570832; bh=dpjB5y+tUCvKa0UrlCayDcigCDoAKE0H2cBz03uq82I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kp+S4lEu7U10nyrHu28TatG1SorAcr9PLf3VBAVq2K2DCrRyTkjkhqFWDAlrtJe+u zdHI2Z4oydEZEyVsgP9TUY7XmPh0ecvVfkHGdDQOW/kRMugskTwCAEG/xCXnP/R8D8 IZloxQLe4CE+qsahHH2msqIKAX+ZrBjFpQ0F3nuYB1QWGBPx/3lv2dvPaAeQZJ7l8v VMn+I0Nh16ZsUQeciXMaPEae6YetZ35m24QJ9HAlaYgjRzfVdwEkrOGHTCDZFlk88q NNJd8ZgL/uYI8oaaXpm6Ybp2DYjsGzPz/UcNz27TpHY+0ivWBOb2sYBE2XVdygzByz jhRRY/aFdRgpQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yang Yingliang , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 26/55] net: mvpp2: check return value after calling platform_get_resource() Date: Tue, 6 Jul 2021 07:26:09 -0400 Message-Id: <20210706112638.2065023-26-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210706112638.2065023-1-sashal@kernel.org> References: <20210706112638.2065023-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yang Yingliang [ Upstream commit 0bb51a3a385790a4be20085494cf78f70dadf646 ] It will cause null-ptr-deref if platform_get_resource() returns NULL, we need check the return value. Signed-off-by: Yang Yingliang Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c index bc5cfe062b10..6fd82f1ce6b3 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c @@ -5157,6 +5157,10 @@ static int mvpp2_probe(struct platform_device *pdev) return PTR_ERR(priv->lms_base); } else { res = platform_get_resource(pdev, IORESOURCE_MEM, 1); + if (!res) { + dev_err(&pdev->dev, "Invalid resource\n"); + return -EINVAL; + } if (has_acpi_companion(&pdev->dev)) { /* In case the MDIO memory region is declared in * the ACPI, it can already appear as 'in-use' -- 2.30.2