Received: by 10.192.165.156 with SMTP id m28csp1197355imm; Wed, 11 Apr 2018 14:21:58 -0700 (PDT) X-Google-Smtp-Source: AIpwx48Ss+uxh8wW7v/WUAiR4hK1jIRlQZ7WuRP3UovoY5Wsx4y8HrM37HrmB0Jh2DFDe9ghE9ho X-Received: by 10.99.179.68 with SMTP id x4mr4623031pgt.132.1523481718385; Wed, 11 Apr 2018 14:21:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523481718; cv=none; d=google.com; s=arc-20160816; b=HcYqERdVgl3MSxxEX9Q8b1dZrhFQwQCQvRwLYhA1HqEuYfiN2wXj2pwmwwiA8LWf84 cGwdovrFXQDU2hRLhZyaMLTBaBxZcUYEPA/EAUtxS7IiMrtJ5Z4wokAM4K83C3ABDPPy vYpSip53lSo8O7qsKL32ASoRbBRYsaL1qiyX1lvlsphkaM2rbdLqQmvfIrUjs3P+fWYd epcBJr1BUwe+TQwynumr1l/GFq0ReQFCh+IhYqsQ8gjtvYu/qLRxYQHItPYVJ7lrkPTO RTNTDUaiRDVWmRVWBCfrPoJnR9ciQuCgc9dV+RiHvbBmT7aaviA4z+TMvhlI1N0MD5To rukA== 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=dOFTOCZQA8xNjxzfEAz0FheLYAnBdxiAAAeWN18NVJc=; b=psS5lv0TwmiWTc0Tvoj/xfK7yiptc7otRP1EaLPlb1eSp/3UtgpyIeVciCnitFwSxw VF6Zyrxr0v14zzYg8OOtcXrjmIqwvoLmfNvUY5cm08UBjwoB0CZDo7WOztxtL69U0n/6 Va3YpiH0qPU4DfWiCi7OYn9Ry88XfS19gBqQ9jMf5sbTAz+aXogRoKcIrFhbP31wjz/y oxKVajucI6V2sb7MNNNZGy0Cf8EPQ9iuBTjBiC6Hq1U7r8egMkgyg4mShltg171FQIA+ 8Icv0nSIe2n55AIMWPmA5KyD6JGz+mkvOXk7i/QP9v8DnpMsACjJebqDr7gZBTEXNbKE wpnw== 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 l75si1384202pfj.375.2018.04.11.14.21.21; Wed, 11 Apr 2018 14:21:58 -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 S1754954AbeDKVRl (ORCPT + 99 others); Wed, 11 Apr 2018 17:17:41 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:56360 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754572AbeDKSkO (ORCPT ); Wed, 11 Apr 2018 14:40:14 -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 115FCC41; Wed, 11 Apr 2018 18:40:13 +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 3.18 058/121] net: freescale: fix potential null pointer dereference Date: Wed, 11 Apr 2018 20:36:01 +0200 Message-Id: <20180411183459.805988100@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180411183456.195010921@linuxfoundation.org> References: <20180411183456.195010921@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 3.18-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 @@ -370,7 +370,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; @@ -378,6 +378,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));