Received: by 10.192.165.156 with SMTP id m28csp1118695imm; Wed, 11 Apr 2018 12:47:48 -0700 (PDT) X-Google-Smtp-Source: AIpwx48kx3eEVOsJzCmm4iYxEf4INtB25ueFry5gxQHOzshQ3wlGJ/T5k/+dzflD/c8TUP5TiBvw X-Received: by 10.99.120.196 with SMTP id t187mr4482587pgc.149.1523476068197; Wed, 11 Apr 2018 12:47:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523476068; cv=none; d=google.com; s=arc-20160816; b=wiOhc/9a7Bl9Yg5/HmmttcGFfAdTjBzGT5u9V9OulClRFHbNlz0mT6iQclaGUyJDXO sOwTh7WTKsem4wWQt3V5xcDRbm/u05YFWfqTUojY3hoQxAKzKD4PCfVwFDWxSm+Tu0eh OZXMsES+k+dOql6MONqhjYgpFILBuL1dOpd/KHQplwYlA5PZ/QFh/7RFBDzf/Imo8mUq hkPsDOM1w2A+7JIpTaOpE9HzDN29Rox/LggTNp3etZbjFy4XoDI4x0vckaZ5bR5KryuQ DET/gWiNWAPptjXwRspJI2lD3MohYgIpyMSgBrn+R1PJ19nLjcsrsM7EaZNFzdcQLNwf vsfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=Cvq68MY8qomHJH3S/+hq08GWyk1k/1e0uRTOvwcJMao=; b=cbPcapqGGPDudM4Si6XzYUiJbmMoMuCOh2iZfydkzkWU6OiMfu+sKkcWlIkWscLCUX gPhukv2dMfn7rjJhHPze7B/6keZP8jF+6+nU/Y99YmmVQaEk5Tc9ukhdpJsoKLGIiEzE GkHXsQLJ+Ftt5XdS3xGnPxipCTTRDNB5RwVIIPo74qlNXqQ3fgVsAjY5sHTes2hL0sGY Tppf9f/npcsqKU1WzsPNWDaQ39rewnbysd/Jng6MIJ4YugspmXGmY9gs8eKWCN25fxVt nRo+Htl/efgwAM3iZuRWmBzwd5OX/MzodxemkPMxPjw9gcDyLLoTpngnGUPAVCTxVbUt 4lEA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o12-v6si1607364plg.650.2018.04.11.12.47.11; Wed, 11 Apr 2018 12:47:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756672AbeDKTAP (ORCPT + 99 others); Wed, 11 Apr 2018 15:00:15 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:37650 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752973AbeDKTAM (ORCPT ); Wed, 11 Apr 2018 15:00:12 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id D452DD1E; Wed, 11 Apr 2018 19:00:11 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Gustavo A. R. Silva" , "David S. Miller" , Sasha Levin Subject: [PATCH 4.9 165/310] net: freescale: fix potential null pointer dereference Date: Wed, 11 Apr 2018 20:35:04 +0200 Message-Id: <20180411183629.478310658@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180411183622.305902791@linuxfoundation.org> References: <20180411183622.305902791@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: "Gustavo A. R. Silva" [ Upstream commit 06d2d6431bc8d41ef5ffd8bd4b52cea9f72aed22 ] Add NULL check before dereferencing pointer _id_ in order to avoid a potential NULL pointer dereference. Addresses-Coverity-ID: 1397995 Signed-off-by: Gustavo A. R. Silva Signed-off-by: David S. Miller Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/freescale/fsl_pq_mdio.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) --- a/drivers/net/ethernet/freescale/fsl_pq_mdio.c +++ b/drivers/net/ethernet/freescale/fsl_pq_mdio.c @@ -381,7 +381,7 @@ static int fsl_pq_mdio_probe(struct plat { const struct of_device_id *id = of_match_device(fsl_pq_mdio_match, &pdev->dev); - const struct fsl_pq_mdio_data *data = id->data; + const struct fsl_pq_mdio_data *data; struct device_node *np = pdev->dev.of_node; struct resource res; struct device_node *tbi; @@ -389,6 +389,13 @@ static int fsl_pq_mdio_probe(struct plat struct mii_bus *new_bus; int err; + if (!id) { + dev_err(&pdev->dev, "Failed to match device\n"); + return -ENODEV; + } + + data = id->data; + dev_dbg(&pdev->dev, "found %s compatible node\n", id->compatible); new_bus = mdiobus_alloc_size(sizeof(*priv));