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 0F385C07E9B for ; Tue, 6 Jul 2021 12:03:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E8A1B62143 for ; Tue, 6 Jul 2021 12:03:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240596AbhGFMFg (ORCPT ); Tue, 6 Jul 2021 08:05:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:47608 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232366AbhGFLgb (ORCPT ); Tue, 6 Jul 2021 07:36:31 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0B1F161F0C; Tue, 6 Jul 2021 11:29:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625570950; bh=ewg361im44F8sFW1ZFkaddSWziBwf+YTsPrcJ9kXGLM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hSDb2niVS7GUcMCt1Y3ngCUSi3UOLgCTtCdcIoZPZUPXK0bgbOo3DZGQKou5gE0HD mMnf/BQAThHHVKXTKxcpBUUnk8OUDQ+W5cKOV7UvfVkGD2UWZCXO57Uag4l4vGHLO+ XJjaOFcSJy40iD+v8/S7qQEGKx9h8qB9wcwTsHc6Njz19vhi4Ylw4UWkKmgp3eDGt1 4qy76lJfhrsrvGJtcgkYkEhNenU4vC8+HHJF4gVIegWXpxWT4lr4jEKUi0J0dt8fv+ vmStfNbcDsYqnP1GoKzQbatC30CyzYEEIXrxeZG4WO0uOyDyJ/Wa26/rUg2fWf0FDg wTq3C6T4L3RAw== 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.9 18/35] fjes: check return value after calling platform_get_resource() Date: Tue, 6 Jul 2021 07:28:30 -0400 Message-Id: <20210706112848.2066036-18-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210706112848.2066036-1-sashal@kernel.org> References: <20210706112848.2066036-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 f18c11812c949553d2b2481ecaa274dd51bed1e7 ] 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/fjes/fjes_main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/fjes/fjes_main.c b/drivers/net/fjes/fjes_main.c index 3511d40ba3f1..440047a239f5 100644 --- a/drivers/net/fjes/fjes_main.c +++ b/drivers/net/fjes/fjes_main.c @@ -1212,6 +1212,10 @@ static int fjes_probe(struct platform_device *plat_dev) adapter->interrupt_watch_enable = false; res = platform_get_resource(plat_dev, IORESOURCE_MEM, 0); + if (!res) { + err = -EINVAL; + goto err_free_control_wq; + } hw->hw_res.start = res->start; hw->hw_res.size = resource_size(res); hw->hw_res.irq = platform_get_irq(plat_dev, 0); -- 2.30.2