Received: by 10.192.165.156 with SMTP id m28csp1161064imm; Wed, 11 Apr 2018 13:36:46 -0700 (PDT) X-Google-Smtp-Source: AIpwx488B/4u1yPCushCRzyr2h/VIbgilz0k5siUdrY10MO5kFnO6OK+4p+OP6JSLr0+DudK35u0 X-Received: by 2002:a17:902:5a3:: with SMTP id f32-v6mr6650233plf.287.1523479005955; Wed, 11 Apr 2018 13:36:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523479005; cv=none; d=google.com; s=arc-20160816; b=Wh6Z1KLwpKjYMlDvGQSWLjyUCakm2XWjTStfE5ybpHzZQCa1cVIl5cLfu9hyt8BmfI 64MN6iUNf1F167tuRn3QwAWOxQGkrBVmqx7dKNxgze+MnXxwO/fy+WmN3WXulm5WyS2R hGwajuKQ7F9hdctwSMZQ1VicStqWEwsx95dBxAkM0eCqH/s/uYs3kx+1PcKnDJkGJJTi uXZbnJqG7Gl1uJQsZOvnuvN2qStVY8vxuOnTJ4NZO66coWHsvtRSxPSa0GBmuwmahj49 BWJKYhdoQGYzHCT6MlK6gi5x718wzyrovZ0oYLmvGXPLZ4BJ9EDWWF0G9FSUk4/YlN6b nBXQ== 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=844I6eU+6AT8u0YvtIVcq+SjZ+sAKJxITQkwYsRrb14=; b=MaJD7ph+q3PN52NiosKo/pKhNxEVufCmjYMUZrpj4s3JTB2+QnELezCP9YWgKGN9er OsPRA5RDDrRx740nOaRLS3dDTKukKA4uAZv4tfNvoKUYEujHhUvUXxcb/JiLuLEqlc8c YgU9IAxNBBNLk9s9JFHW/oS5UJVDW9bL6AKg+UjIH+Mr5Cvvf+I6eFkxY2AecrifOGRy tbrL8GR6LUuKC+/Rar9iYI/3MJhxoCIYBM4aYHhMbSk6VsH2dMwiqbtG8xhPyqMPsCJG zK4jSiiMpnvIJ0XS5oUZEuqxRG21tpP5jc+ys9DIrAAiJGEfTj0piwZ6eOQKwZGnMP11 yu/w== 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 q21-v6si1012687pls.3.2018.04.11.13.36.09; Wed, 11 Apr 2018 13:36:45 -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 S1754753AbeDKUa6 (ORCPT + 99 others); Wed, 11 Apr 2018 16:30:58 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:60546 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754785AbeDKSts (ORCPT ); Wed, 11 Apr 2018 14:49:48 -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 84055CB9; Wed, 11 Apr 2018 18:49:47 +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.4 105/190] net: freescale: fix potential null pointer dereference Date: Wed, 11 Apr 2018 20:35:51 +0200 Message-Id: <20180411183556.747142708@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180411183550.114495991@linuxfoundation.org> References: <20180411183550.114495991@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.4-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 @@ -382,7 +382,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; @@ -390,6 +390,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));