Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp4571363pxv; Tue, 6 Jul 2021 04:20:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxpSpknukyjjaLgo1WlDdbK6Am0DdH9eJMUgQ/ZKnvZcqDiIK0pdZtGhtvMa434rRs3RXyE X-Received: by 2002:a17:906:c41a:: with SMTP id u26mr18163210ejz.270.1625570437571; Tue, 06 Jul 2021 04:20:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625570437; cv=none; d=google.com; s=arc-20160816; b=tSq0mSMIlJC++s9AfUFvEIRdrr3OuIKmRLv80bqd55zlytxdOxX+AMgVsm3Xf+QiKs 1+lZd7jpo/lLugOIP+6hg/uMV+gbxNTWNnM5UjcbB7/DaBZgiDy/65aNINLF5dJiVix2 7ZSSwgKnj77/uZQuvk6h2g4KSz3jJ8rsRjoMndh1qacTJuoeyv/0xtVVzPDUfFljJcAL Tt/jO7U6M0FdomlHvvudi3/xRDKn2zLcrev6lmaMEB5t7KnlcQ6UgMQBpSP1pgaBaimP IuJJbsH59/VZZy1e6wdVmt6GjkqJg3E1Z2nsN/qqlS8HbTX5VN/4SIzH06TUN3tSZP9/ QVfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=h6JZdQrFqkISDo78un1njuOwPxN6UEEcYOJot5PvmTc=; b=yhbXgtxMYRWvB7bAKpbD4g2Yfeya/5JqFWvRrIzcuqeQHPKTly4fbY48QEG78Xpteq POYvrrFiYYTZIitEJOzQkG5E1irv8rwCtGaogAkZ1hJdiNikH0tJsRiXbF49oinKwN2O bT6jjLrr/bhqiA7b7yZpdZpNskWUjKHkdhn44V0vonDP1Z73VKFl0eqPUQ3nyYFAiOWC DD3GsIAhEJLZd8F++UTHMWmxEUVAth/mBXP3NHwd/JO3l4eMgCGLu10L/UKAWczn71N2 31O+2Bj4t2T48R9olq1D0ELz4dHssVa5nvmTC9Qc2BLMLZoWIU92NMj2ZVkf9se3W8IF qyzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=BXFQyYjr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v5si16610960edi.582.2021.07.06.04.20.13; Tue, 06 Jul 2021 04:20:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=BXFQyYjr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233270AbhGFLV6 (ORCPT + 99 others); Tue, 6 Jul 2021 07:21:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:55052 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232444AbhGFLSl (ORCPT ); Tue, 6 Jul 2021 07:18:41 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0F36B61C68; Tue, 6 Jul 2021 11:16:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1625570162; bh=lBjcw4sOunxgl3Hqp9I4bME8z73756FTDxGKXLgCxdw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BXFQyYjrCES16KnMJcidpaZDFQgdTEiERjMYPD6UfnN4P0rGA/9gKKZabCcKtEyrZ +91TRVVQA0xXuoGJGFXk+mhY0sXopjURjZxAS0lSWlr1Qr9t9XGYtf97LvomoMEN/G XVh7cHt0OpnMp1IONLjkJjZ2CFmUa067dUKkekCBl8wk7OEY4ifVQIAAliPL2+4Xvu CF9Ryz0qKia0k1ccww4JHwDHKVkTgwMPfhwwoAYiqMPMBfi7sBNNf4SKchyUGjcK7g KWEMGxR0nVh1TwM8tKabnrPcAdK5iBgYrTds2mlFluDZpiu5CBE8Huul7owMxz/b/+ w/hmVPFea+ULw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yang Yingliang , Vladimir Oltean , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.13 083/189] net: mscc: ocelot: check return value after calling platform_get_resource() Date: Tue, 6 Jul 2021 07:12:23 -0400 Message-Id: <20210706111409.2058071-83-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210706111409.2058071-1-sashal@kernel.org> References: <20210706111409.2058071-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 f1fe19c2cb3fdc92a614cf330ced1613f8f1a681 ] It will cause null-ptr-deref if platform_get_resource() returns NULL, we need check the return value. Signed-off-by: Yang Yingliang Reviewed-by: Vladimir Oltean Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/dsa/ocelot/seville_vsc9953.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/dsa/ocelot/seville_vsc9953.c b/drivers/net/dsa/ocelot/seville_vsc9953.c index 84f93a874d50..deae923c8b7a 100644 --- a/drivers/net/dsa/ocelot/seville_vsc9953.c +++ b/drivers/net/dsa/ocelot/seville_vsc9953.c @@ -1206,6 +1206,11 @@ static int seville_probe(struct platform_device *pdev) felix->info = &seville_info_vsc9953; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) { + err = -EINVAL; + dev_err(&pdev->dev, "Invalid resource\n"); + goto err_alloc_felix; + } felix->switch_base = res->start; ds = kzalloc(sizeof(struct dsa_switch), GFP_KERNEL); -- 2.30.2