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=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 7EE57C43215 for ; Fri, 22 Nov 2019 05:52:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 483BD2068F for ; Fri, 22 Nov 2019 05:52:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574401923; bh=XrgJf33ZX605w5/MqKEYzTarUruBrWyg+SRbs6OYdtc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2PNrG4gnmodFvclyLc9ufCsYQcrEi7W72x8oZRhpZZlbd85IfMLMY0IMUT72Wkaug aBlSFKiXPTHTkQPU9DXhEwxRdm56SBKCwqarMgCCs/p6vQaDgwZqaNdzNJmiWPTtf0 hZN1efQsWxaTVY223PeuoXzFZL9FCYp0NDqcR/gE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728377AbfKVFwB (ORCPT ); Fri, 22 Nov 2019 00:52:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:57382 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728366AbfKVFwA (ORCPT ); Fri, 22 Nov 2019 00:52:00 -0500 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 A78112068F; Fri, 22 Nov 2019 05:51:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574401920; bh=XrgJf33ZX605w5/MqKEYzTarUruBrWyg+SRbs6OYdtc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q2L0S9UsmAM8rDpfUDqYewUQjpjGJCiOHi0pq7PMK7ApcZNA7dKaIQZB9mEMdsGlK fQ6kpFO6ARUTiKujEvMMSALlieoMfJ+Y4sFpIcc9UPA1GCNhgZPxxOdEUol8wK1cNk iANZYb/l9Egc8HBZ2tSFIYBgpRNVFyEuWi2rI6n8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kangjie Lu , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 150/219] net: marvell: fix a missing check of acpi_match_device Date: Fri, 22 Nov 2019 00:48:02 -0500 Message-Id: <20191122054911.1750-143-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191122054911.1750-1-sashal@kernel.org> References: <20191122054911.1750-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Kangjie Lu [ Upstream commit 92ee77d148bf06d8c52664be4d1b862583fd5c0e ] When acpi_match_device fails, its return value is NULL. Directly using the return value without a check may result in a NULL-pointer dereference. The fix checks if acpi_match_device fails, and if so, returns -EINVAL. Signed-off-by: Kangjie Lu Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c index 9b608d23ff7ee..9d95add05e3e6 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c @@ -5131,6 +5131,8 @@ static int mvpp2_probe(struct platform_device *pdev) if (has_acpi_companion(&pdev->dev)) { acpi_id = acpi_match_device(pdev->dev.driver->acpi_match_table, &pdev->dev); + if (!acpi_id) + return -EINVAL; priv->hw_version = (unsigned long)acpi_id->driver_data; } else { priv->hw_version = -- 2.20.1