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=-20.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 89C72C07E96 for ; Tue, 6 Jul 2021 12:13:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 75F10621F7 for ; Tue, 6 Jul 2021 12:13:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237787AbhGFMQB (ORCPT ); Tue, 6 Jul 2021 08:16:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:47602 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237151AbhGFLf5 (ORCPT ); Tue, 6 Jul 2021 07:35:57 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id ACFC361EAF; Tue, 6 Jul 2021 11:25:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625570744; bh=iQuNtrz8wjlsTe62AYtmmRArf0A0Q00ObZJPInEUwrk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rH7t9/3yxuqjjMukjOdL6CevPGnkifOnvjnWNxoz/HeoBjqwAkNtvyGlo9BpsqLWM 4bcgzZWrmI6IJVqxoDrTIAQV1LoomAnuvpmPWeooA0cUnajJoMdkiNkaHSPtvzeNfC aKxLfb6snHR2e4GmlR9TpKxa8yxgmhNN/+3ZQCiOBFOD2PECVAl+QodM/tp8gIHsZp hiuoVrEO14eR8WnYHse4teDfyv/Y1GYGLKrxXph+duZc3LR33xkTPq51GNxMIYNznF 6H3e1V/6Nd367frJuRlU5Ni/HF7vQVbXWBakQFjClhjF3V8/BEyguV2q+z50VHaZn+ EoZG8qIVJ+n8g== 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 5.4 33/74] net: micrel: check return value after calling platform_get_resource() Date: Tue, 6 Jul 2021 07:24:21 -0400 Message-Id: <20210706112502.2064236-33-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210706112502.2064236-1-sashal@kernel.org> References: <20210706112502.2064236-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 20f1932e2282c58cb5ac59517585206cf5b385ae ] 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/micrel/ks8842.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/ethernet/micrel/ks8842.c b/drivers/net/ethernet/micrel/ks8842.c index da329ca115cc..fb838e29d52d 100644 --- a/drivers/net/ethernet/micrel/ks8842.c +++ b/drivers/net/ethernet/micrel/ks8842.c @@ -1136,6 +1136,10 @@ static int ks8842_probe(struct platform_device *pdev) unsigned i; iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!iomem) { + dev_err(&pdev->dev, "Invalid resource\n"); + return -EINVAL; + } if (!request_mem_region(iomem->start, resource_size(iomem), DRV_NAME)) goto err_mem_region; -- 2.30.2