From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1369136-1517180619-2-9991009795686170874 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES unknown, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517180618; b=s3fzswANcTCwFjE0gaQtZkJY9KL2HXBeWCGKK66CP5f20OC 1GTohsrOyeVC4xsjXh0j2R93TaTImHgDy4emom4FwAw2/uLh9Ntd3NOE8R+sru7i Yznb3FyD8iA7ecF1iw+mX3qGIsCEODRHZGnVJ1gVMpTJV5Q+iz7AG3FOEeWYuIeI jim73UU+OpMT4K0lUQmM3y6c5gInAGNq2apNjQ6GrzB6Ffga1ngH04bFx3A/fzAY 3KnRjhtHotNmvXbG4hrP/a81tF5PXN88ReF7gez7vP9qx/zYbTaIIM0NWf45bvr9 I4+ttWc10cyG6cEpMaPeJcnIGizL94JvoHi252A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1517180618; bh=xov01n SwGtRFpBB28GPjfk/C4hYLy9cMNJnr96otZ0w=; b=hXOsIAmM9sRBt7rfTdPlqA 7Zm5uXMtrZJui6HSjPn5HusE1xcyxD39KEF86Ek2JNWqqncLc2N7PhrSYe9+Z5ur PVPxc3R72Ba0x+ggt08xfjGcWg3EP6rEpovE55aFnSvD6XFclZQjNG6LIs5HFzf3 jBH1Buhvfc8CtwuYU2SH3qNpaorc6pihpuIIyYwjcWs01VRWTbzcg1EPJkfh7rDu IR2wRdMF8HzWMzGMRmfe7YhKgPhPVBmbTy4EzuVdJYXNDJYGOIYMftp7ZGiZU1uQ xbHOx5h6eKYl0LIRQ9Bnj+Iij5Q2ZRakY8AuZLzgOUDgxydRgti8J6/vdtFFBlYg == ARC-Authentication-Results: i=1; mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=Aj7VQ7/h x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=Aj7VQ7/h x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751358AbeA1XDY (ORCPT ); Sun, 28 Jan 2018 18:03:24 -0500 Received: from mail-by2nam03on0134.outbound.protection.outlook.com ([104.47.42.134]:46538 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752693AbeA1W1k (ORCPT ); Sun, 28 Jan 2018 17:27:40 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Andrew Lunn , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 069/100] net: dsa: mv88e6xxx: Unregister MDIO bus on error path Thread-Topic: [PATCH AUTOSEL for 4.14 069/100] net: dsa: mv88e6xxx: Unregister MDIO bus on error path Thread-Index: AQHTmIcTCVaFw0MrYUWwMI6BvLgGUQ== Date: Sun, 28 Jan 2018 22:26:43 +0000 Message-ID: <20180128222547.7398-69-alexander.levin@microsoft.com> References: <20180128222547.7398-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222547.7398-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB1034;6:UtS8dl/L/7J5V5udcrZ/84f7eQDnBErs4jLm/niBwy+E5PQLLbS8S10rEgb4mFkmtRSFh8vWdlxJPvZd2GypMAggx9zxJ2eM1hwDoz7cb5bXtZVvXKdnuQie6ArCHiu+cUj4r/eKTfS5/cl9Xn3fP4yw1+hBKNuKQDhD60UxkL2AL8Wx+RdB5Vvjp0SY13cSkVEJuv34ODKtNsyoli3x2mRIh1gSrH3/4oQNn18+27mKRpom9fTZQJGZj6P1Nzk1s7MDakk82iqVZ1A3qIZrcb7t9wa7bK7+vtZCaAxfrD44zjw2CJpwaQQCDsRoJ2enKHNDLfq9oMSrddnoyUiVHK+xbIaJ08Esdht9LjkcAFfl1q5MXrC3b4mKVpjM6A8j;5:CkHu4WrZ1OPfzdSwuS6aR4OTBqC3mltco1pxoW6vU+SltdNliXqW+O+swugg2MFI5+Fr00+bhWi63IBFz6qI69iATrNB8pFy5i3ad+8Xqf4ykfpOJDPHv4N1CRHYAC5Q6SBGMR/FIej1IdYFspdI+/sFVSV+7so3QsHqYXH0Alw=;24:FpfjB3G1HnXnLyZMD7inXorjHkA6twW8gJYLwqK88G55QWv7n8inScMJ23i59uT4T1+yzRSOxkm1QSM2PsM09cAN5wQP4VByFGoQxg/1B0s=;7:Os0i7LynrY4eHE5kEJWrcV/e8Tn02Spa2YHF1ZbX8oo/P24r1s42HCUW9CGCiiO7fD8WVxljqt+UMgvt1toiGc4uW/9r69P6ARMIZ44S1bBQv3Ccf641vJi/ptb5jTNuT9NOrLdX9rt8Af+WpXDmKO5Rw8XX8zp/shrXqmfsmSe0jhhmK8U8ncM4YVpc1WQOXFO17PXpbrVwIJyi9rbfJ4EPVmPHFjEI7n6kKjET79h/SzW/CYFNFwSpnatAZ9wD x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: d8b2efd4-6c05-4c14-ee9f-08d5669e554e x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1034; x-ms-traffictypediagnostic: MW2PR2101MB1034: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011);SRVR:MW2PR2101MB1034;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1034; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(39860400002)(346002)(376002)(396003)(366004)(39380400002)(199004)(189003)(2906002)(2950100002)(26005)(1076002)(66066001)(6116002)(5660300001)(3846002)(186003)(316002)(22452003)(54906003)(110136005)(6666003)(86612001)(36756003)(6486002)(86362001)(53936002)(6436002)(6512007)(106356001)(8676002)(105586002)(305945005)(7736002)(68736007)(478600001)(81166006)(102836004)(76176011)(6506007)(72206003)(10290500003)(14454004)(2900100001)(3660700001)(99286004)(97736004)(81156014)(25786009)(8936002)(4326008)(5250100002)(3280700002)(2501003)(10090500001)(107886003)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1034;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; x-microsoft-antispam-message-info: 6IUNeD1BgmcFJ5gNsG/Jmb9G2rCeOsf5RTI4DjPtWzfyeLkEcQpwfxGQR1lJZW0UCQMNLA0N8ZQgKXXIZGtaYQ== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: d8b2efd4-6c05-4c14-ee9f-08d5669e554e X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:26:43.9500 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1034 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Andrew Lunn [ Upstream commit 3126aeec5313565bfa19e2dd8fd7e3c3390514cb ] The MDIO busses need to be unregistered before they are freed, otherwise BUG() is called. Add a call to the unregister code if the registration fails, since we can have multiple busses, of which some may correctly register before one fails. This requires moving the code around a little. Fixes: a3c53be55c95 ("net: dsa: mv88e6xxx: Support multiple MDIO busses") Signed-off-by: Andrew Lunn Reviewed-by: Vivien Didelot Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/dsa/mv88e6xxx/chip.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/c= hip.c index 07704b372861..eebda5ec9676 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -2153,6 +2153,19 @@ static const struct of_device_id mv88e6xxx_mdio_exte= rnal_match[] =3D { { }, }; =20 +static void mv88e6xxx_mdios_unregister(struct mv88e6xxx_chip *chip) + +{ + struct mv88e6xxx_mdio_bus *mdio_bus; + struct mii_bus *bus; + + list_for_each_entry(mdio_bus, &chip->mdios, list) { + bus =3D mdio_bus->bus; + + mdiobus_unregister(bus); + } +} + static int mv88e6xxx_mdios_register(struct mv88e6xxx_chip *chip, struct device_node *np) { @@ -2177,27 +2190,16 @@ static int mv88e6xxx_mdios_register(struct mv88e6xx= x_chip *chip, match =3D of_match_node(mv88e6xxx_mdio_external_match, child); if (match) { err =3D mv88e6xxx_mdio_register(chip, child, true); - if (err) + if (err) { + mv88e6xxx_mdios_unregister(chip); return err; + } } } =20 return 0; } =20 -static void mv88e6xxx_mdios_unregister(struct mv88e6xxx_chip *chip) - -{ - struct mv88e6xxx_mdio_bus *mdio_bus; - struct mii_bus *bus; - - list_for_each_entry(mdio_bus, &chip->mdios, list) { - bus =3D mdio_bus->bus; - - mdiobus_unregister(bus); - } -} - static int mv88e6xxx_get_eeprom_len(struct dsa_switch *ds) { struct mv88e6xxx_chip *chip =3D ds->priv; --=20 2.11.0