From patchwork Wed Aug 26 09:51:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 1351763 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Bc1NM2rx3z9sPB for ; Wed, 26 Aug 2020 19:51:47 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728047AbgHZJvp (ORCPT ); Wed, 26 Aug 2020 05:51:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727997AbgHZJvp (ORCPT ); Wed, 26 Aug 2020 05:51:45 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 43D68C061574 for ; Wed, 26 Aug 2020 02:51:45 -0700 (PDT) Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kAs5m-0006RB-IR; Wed, 26 Aug 2020 11:51:42 +0200 Received: from sha by dude.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1kAs5l-0001Lu-VQ; Wed, 26 Aug 2020 11:51:41 +0200 From: Sascha Hauer To: netdev@vger.kernel.org Cc: Andrew Lunn , Florian Fainelli , Heiner Kallweit , kernel@pengutronix.de, Sascha Hauer Subject: [PATCH] net: mdiobus: fix device unregistering in mdiobus_register Date: Wed, 26 Aug 2020 11:51:41 +0200 Message-Id: <20200826095141.5156-1-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: netdev@vger.kernel.org Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org __mdiobus_register() can fail between calling device_register() and setting bus->state to MDIOBUS_REGISTERED. When this happens the caller will call mdiobus_free() which then frees the mdio bus structure. This is not allowed as the embedded struct device is already registered, thus must be freed dropping the reference count using put_device(). To accomplish this set bus->state to MDIOBUS_UNREGISTERED after having registered the device. With this mdiobus_free() correctly calls put_device() instead of freeing the mdio bus structure directly. Signed-off-by: Sascha Hauer --- drivers/net/phy/mdio_bus.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index 0af20faad69d..85cbaab4a591 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -540,6 +540,8 @@ int __mdiobus_register(struct mii_bus *bus, struct module *owner) return -EINVAL; } + bus->state = MDIOBUS_UNREGISTERED; + mutex_init(&bus->mdio_lock); mutex_init(&bus->shared_lock);