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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 79A71C76186 for ; Wed, 24 Jul 2019 19:45:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4F9062083B for ; Wed, 24 Jul 2019 19:45:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563997514; bh=KFUjm0H86IfclthYtdlyr4q47GTjpoPT65+A/Mnqdls=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dPZ6qB7BVLrJ3xZNMwXCVcvH+n9SVHlHP5DyXs5BYDKf5qYnievUnP7Pg6qkdUDVQ Yzb/J6mcadYuJ1yqfQLobuNM7BxKQRDLFT/bM/oS2tfyTno+k9m5pjA67PnZZdswQ/ 18iV8lgzAQgXDzuiEd8Izg1zyd5RyZc8dxoNRP8g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390054AbfGXTpN (ORCPT ); Wed, 24 Jul 2019 15:45:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:48618 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390938AbfGXTpL (ORCPT ); Wed, 24 Jul 2019 15:45:11 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 07E92214AF; Wed, 24 Jul 2019 19:45:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563997510; bh=KFUjm0H86IfclthYtdlyr4q47GTjpoPT65+A/Mnqdls=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jxczrrDnlOFqYtHL3jqXEBBrigjJcOnMjj5BdufvAVD4tB2WEIonYmew1yArl6787 v2B+fgfXC3WmQTrz2UxwZ5P5CTptns0Fi3m328z91y+4iJPkiGKsL8cKi6y11isUGt PfkaxxuQwPb+L2PfADeHJwj1eAd5DaxzFd7nb2w8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ioana Ciornei , Andrew Lunn , Florian Fainelli , "David S. Miller" , Sasha Levin Subject: [PATCH 5.1 049/371] net: phy: Check against net_device being NULL Date: Wed, 24 Jul 2019 21:16:41 +0200 Message-Id: <20190724191728.389785727@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191724.382593077@linuxfoundation.org> References: <20190724191724.382593077@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 82c76aca81187b3d28a6fb3062f6916450ce955e ] In general, we don't want MAC drivers calling phy_attach_direct with the net_device being NULL. Add checks against this in all the functions calling it: phy_attach() and phy_connect_direct(). Signed-off-by: Ioana Ciornei Suggested-by: Andrew Lunn Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/phy/phy_device.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index f6a6cc5bf118..e748aee82033 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -948,6 +948,9 @@ int phy_connect_direct(struct net_device *dev, struct phy_device *phydev, { int rc; + if (!dev) + return -EINVAL; + rc = phy_attach_direct(dev, phydev, phydev->dev_flags, interface); if (rc) return rc; @@ -1290,6 +1293,9 @@ struct phy_device *phy_attach(struct net_device *dev, const char *bus_id, struct device *d; int rc; + if (!dev) + return ERR_PTR(-EINVAL); + /* Search the list of PHY devices on the mdio bus for the * PHY with the requested name */ -- 2.20.1