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,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 91086C433FF for ; Fri, 2 Aug 2019 09:31:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 676F8217D6 for ; Fri, 2 Aug 2019 09:31:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564738264; bh=txmXiWqj/bOInPP2k72IyR0HEsyLeYtrFYT2lWw1peE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ajysAb6VBlq+VVs+RrHB1CYPcwDdBYjsmtAjlddMZommrUjgcoUHF26o6y0OcepaW WxtfAZ+GMutiDnye/8llAV0TaztM4RToN5H8gk6A8X4cM+jCvlHprY8JHuZymxFH2n ZzTodvLCa6Ym6vsElExvP+oSgakQdJEgKkBGv5uE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389830AbfHBJbD (ORCPT ); Fri, 2 Aug 2019 05:31:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:56828 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729469AbfHBJbC (ORCPT ); Fri, 2 Aug 2019 05:31:02 -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 65890217D7; Fri, 2 Aug 2019 09:31:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564738261; bh=txmXiWqj/bOInPP2k72IyR0HEsyLeYtrFYT2lWw1peE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XrtLNzmnmq8NqbnpXIrHTILwuasjiOa/s2ZPTbtu9bSDmGTsB4FqVqN22rKvA9S4o +7lEqC0edFthghIa3gjkKSh946k/096GT6mtcOXzxsUx895Aa+CozBBwirR0wY2U8J 0Tz159Y+C8HbOF7Vhk0UePXgrB/CWFRyAHMWRZv8= 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 4.4 018/158] net: phy: Check against net_device being NULL Date: Fri, 2 Aug 2019 11:27:19 +0200 Message-Id: <20190802092207.168384452@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802092203.671944552@linuxfoundation.org> References: <20190802092203.671944552@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 70f26b30729c..c6a87834723d 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -472,6 +472,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; @@ -704,6 +707,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