Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp4143527pxb; Mon, 27 Sep 2021 10:15:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx6l194HrR1X/gwr0zI2fhJ4LupT7NLSNJTs8ZWuQjspz4rJk22uBsiYfzAe3ODO6X7txZg X-Received: by 2002:a63:2cce:: with SMTP id s197mr641153pgs.45.1632762951168; Mon, 27 Sep 2021 10:15:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632762951; cv=none; d=google.com; s=arc-20160816; b=StRGuAfGt5ly+ZEcnjyeYK59qTrO0TAXKE/Z8ntf50AqwKfrSuNV8VtghFIBDqa2Lv NVjwxBkDBWno3j1S8vJrRfgH8UlyUKvsv4euVK7/RTJCqBPU7gYYg7V2pxem2xpCygF5 mQQMjT8pVAet//Wq4kG94zQVKC0wI0h+/08abCZt/L4nVRikLKGhbkaRotcLeILJWV62 Vz4GtxZn54Jg8RifwX5rqX2TNT+b3q2hId7cgeM9cMMb8NqLAu8Y1j0ANSGlzSwSbGMP n/URL0SpS+5qCdyER6JrYNz5gSWyMw5C/FblQAjjFixVw7zVmDVzt/w4RKVT20Uq5jsz 2aiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=8E6kwCQt3OR/f5vIBvIxse3wpA2MtI/i2W4nbGhuUfE=; b=H9DrZ3PSqE2vs2m76TpfxLWtFBUKAHmheoKCFY5F1ZHL8Jq+C7kSTKRwlrIrEcOeyD NSBQOlr8WaBKn0ER7lHjuotYTJ7LrG09KO4GDRzbLmHQ21pbiGxUtFMuyEyfRfFk7O9b qXhEIEz8/sLGLN50ZT4RiaoJpQNsVAVyG6ky2EBDaN+2bwe/rkXXW+jMoTt1C4kHrsdL ONZZasNTsMPyzg1b0pSIOvm5H6Nzmi2S9rWhE7SNbicT/ylRRpaEjtWVh4ZE8GFTFgA0 GduwB2kWB1a47EaxFjE+ug1jHdQGJxRxgZY1RQOmXAogvtitHINteg7AvGcvxbTZuPwu sGEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=sFzJCKjc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v11si22911203pgr.56.2021.09.27.10.15.38; Mon, 27 Sep 2021 10:15:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=sFzJCKjc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236397AbhI0RQa (ORCPT + 99 others); Mon, 27 Sep 2021 13:16:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:46130 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235766AbhI0RLU (ORCPT ); Mon, 27 Sep 2021 13:11:20 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id F25A4611C2; Mon, 27 Sep 2021 17:08:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1632762494; bh=HiR7uajrARarixycHTx6stbc43l2Q8NQ8R/iJV3Ij2g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sFzJCKjc6SOkVT2F9UdXMY0Rx3nzjuSF7L/3EmgMhQbVponguVXVN/Wt4g9zswW66 5uwOdws4qlW3zfWl4w4P3wKnXGox5K0c1usM7fhVAno5gmEkKYozPT+QovHGOF3dwX +lJ6IoWsV+FUlwpOxI7Yhou7xdnM8wI6UkO2C+Tg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lino Sanfilippo , =?UTF-8?q?Alvin=20=C5=A0ipraga?= , Vladimir Oltean , Andrew Lunn , "David S. Miller" , Sasha Levin Subject: [PATCH 5.10 044/103] net: dsa: realtek: register the MDIO bus under devres Date: Mon, 27 Sep 2021 19:02:16 +0200 Message-Id: <20210927170227.272823378@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210927170225.702078779@linuxfoundation.org> References: <20210927170225.702078779@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vladimir Oltean [ Upstream commit 74b6d7d13307b016f4b5bba8198297824c0ee6df ] The Linux device model permits both the ->shutdown and ->remove driver methods to get called during a shutdown procedure. Example: a DSA switch which sits on an SPI bus, and the SPI bus driver calls this on its ->shutdown method: spi_unregister_controller -> device_for_each_child(&ctlr->dev, NULL, __unregister); -> spi_unregister_device(to_spi_device(dev)); -> device_del(&spi->dev); So this is a simple pattern which can theoretically appear on any bus, although the only other buses on which I've been able to find it are I2C: i2c_del_adapter -> device_for_each_child(&adap->dev, NULL, __unregister_client); -> i2c_unregister_device(client); -> device_unregister(&client->dev); The implication of this pattern is that devices on these buses can be unregistered after having been shut down. The drivers for these devices might choose to return early either from ->remove or ->shutdown if the other callback has already run once, and they might choose that the ->shutdown method should only perform a subset of the teardown done by ->remove (to avoid unnecessary delays when rebooting). So in other words, the device driver may choose on ->remove to not do anything (therefore to not unregister an MDIO bus it has registered on ->probe), because this ->remove is actually triggered by the device_shutdown path, and its ->shutdown method has already run and done the minimally required cleanup. This used to be fine until the blamed commit, but now, the following BUG_ON triggers: void mdiobus_free(struct mii_bus *bus) { /* For compatibility with error handling in drivers. */ if (bus->state == MDIOBUS_ALLOCATED) { kfree(bus); return; } BUG_ON(bus->state != MDIOBUS_UNREGISTERED); bus->state = MDIOBUS_RELEASED; put_device(&bus->dev); } In other words, there is an attempt to free an MDIO bus which was not unregistered. The attempt to free it comes from the devres release callbacks of the SPI device, which are executed after the device is unregistered. I'm not saying that the fact that MDIO buses allocated using devres would automatically get unregistered wasn't strange. I'm just saying that the commit didn't care about auditing existing call paths in the kernel, and now, the following code sequences are potentially buggy: (a) devm_mdiobus_alloc followed by plain mdiobus_register, for a device located on a bus that unregisters its children on shutdown. After the blamed patch, either both the alloc and the register should use devres, or none should. (b) devm_mdiobus_alloc followed by plain mdiobus_register, and then no mdiobus_unregister at all in the remove path. After the blamed patch, nobody unregisters the MDIO bus anymore, so this is even more buggy than the previous case which needs a specific bus configuration to be seen, this one is an unconditional bug. In this case, the Realtek drivers fall under category (b). To solve it, we can register the MDIO bus under devres too, which restores the previous behavior. Fixes: ac3a68d56651 ("net: phy: don't abuse devres in devm_mdiobus_register()") Reported-by: Lino Sanfilippo Reported-by: Alvin Šipraga Signed-off-by: Vladimir Oltean Reviewed-by: Andrew Lunn Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/dsa/realtek-smi-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/dsa/realtek-smi-core.c b/drivers/net/dsa/realtek-smi-core.c index 8e49d4f85d48..6bf46d76c028 100644 --- a/drivers/net/dsa/realtek-smi-core.c +++ b/drivers/net/dsa/realtek-smi-core.c @@ -368,7 +368,7 @@ int realtek_smi_setup_mdio(struct realtek_smi *smi) smi->slave_mii_bus->parent = smi->dev; smi->ds->slave_mii_bus = smi->slave_mii_bus; - ret = of_mdiobus_register(smi->slave_mii_bus, mdio_np); + ret = devm_of_mdiobus_register(smi->dev, smi->slave_mii_bus, mdio_np); if (ret) { dev_err(smi->dev, "unable to register MDIO bus %s\n", smi->slave_mii_bus->id); -- 2.33.0