Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Ioana Ciornei <ioana.ciornei@nxp.com>
To:     "gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>
CC:     Ioana Ciocoi Radulescu <ruxandra.radulescu@nxp.com>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Ioana Ciornei <ioana.ciornei@nxp.com>
Subject: [PATCH 3/7] staging: fsl-dpaa2/ethsw: Remove netdevice on port
 probing error
Thread-Topic: [PATCH 3/7] staging: fsl-dpaa2/ethsw: Remove netdevice on port
 probing error
Thread-Index: AQHUvhJe63BKBIYcukuv+vm+VSTauQ==
Date:   Wed, 6 Feb 2019 11:52:00 +0000
Message-ID: <1549453888-24593-4-git-send-email-ioana.ciornei@nxp.com>
References: <1549453888-24593-1-git-send-email-ioana.ciornei@nxp.com>
In-Reply-To: <1549453888-24593-1-git-send-email-ioana.ciornei@nxp.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-messagesentrepresentingtype: 1
x-mailer: git-send-email 1.9.1
x-originating-ip: [86.34.165.90]
x-ms-publictraffictype: Email
x-microsoft-exchange-diagnostics: 1;VI1PR0402MB3743;6:muoBnh9SRkZBbevtKxlAN4O+0s/GbMFwAUxM9UJHll6ntSZReAGGvYszC4eo463kVjeZCDdb3ObC2cKWcqznktdo8rJYJ7skM3hyy6WvD+XhrGc/ruGzYdseRYBegIMe7aFFVj/Z/Mw/MmbH+ZEtxh7aNTnIjO4zCUAC2Y7gbFEy99jWAd9u7q+vIhvzy+SfYziKSJ6JV5u9ahy83dUOgamJH+UQrYf8wgF4XTc4HK8iWXDYdOo1dEg1Uol2LufYuE2lH7x6zBdoiUIDkSYbVNgIvcaRR5uiYl/IgUSlox7NhUN5wM2mKCg4tCsnoCCuhp2B98owIT9xeOGwHvj1EN/ol0BBI5+eHZmS0fDAPgnp5Ql38XCzMfrscfAMo53BsiUfEmyGJoj6ioen73oXf3vtMGhoT94/MUzG9W1Qn4/6imi9uDP5A/DSTWecbFd8ItbaDHw4bSZgkAEgITk2Ng==;5:5Lx6VXQE401cV8xgfOb/FJrFUo56JsEW5qMV0Slfu09zERpCO7YqLB8nPM/3ZEQZyExvAVJXa13m6lnw5yznldsokyjuibs3vVAbSnlqAxtft6UP7jhf2sFAaOqRl8UGm/D1//bJv2V65x06PX4zxD44e3fsVnFABrAYl3FQ42l80Xwpnet0D1b0QkaxDaFkYf4Z1oIgJ8pIcyNGqq37YQ==;7:huMAQ5E30AXWTNiVYL+ioWQ+toL4+Qu/kMTNMQHm/++JNUjEri7fYm8nnRYrNes1/Db99BSQesTO2LRn2WhfFODGsp5YvC2x2AH0Fn15Ca2mFq2Q2v21+BTWcOT/VcjcEV6kn/abc9sV2DJ0OdLzzg==
x-ms-office365-filtering-correlation-id: 9e77e805-b485-4332-1b98-08d68c2980ef
x-ms-office365-filtering-ht: Tenant
x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020);SRVR:VI1PR0402MB3743;
x-ms-traffictypediagnostic: VI1PR0402MB3743:
x-microsoft-antispam-prvs: <VI1PR0402MB3743C0B081C1B43119AA0A0DE06F0@VI1PR0402MB3743.eurprd04.prod.outlook.com>
x-forefront-prvs: 0940A19703
x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(366004)(39860400002)(136003)(376002)(346002)(396003)(189003)(199004)(256004)(6486002)(386003)(6506007)(486006)(53936002)(68736007)(102836004)(478600001)(86362001)(2351001)(14454004)(105586002)(71190400001)(71200400001)(2616005)(11346002)(106356001)(6436002)(446003)(26005)(476003)(4326008)(305945005)(186003)(76176011)(7736002)(81156014)(97736004)(99286004)(44832011)(5640700003)(54906003)(8676002)(6512007)(36756003)(1730700003)(81166006)(316002)(3846002)(2501003)(6916009)(6116002)(25786009)(50226002)(52116002)(2906002)(66066001)(8936002);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR0402MB3743;H:VI1PR0402MB2800.eurprd04.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1;
received-spf: None (protection.outlook.com: nxp.com does not designate
 permitted sender hosts)
x-ms-exchange-senderadcheck: 1
x-microsoft-antispam-message-info: UhPLzmDxdQQW2zotmQidfvUZ6Ksbf6nvNWnNu/DGU95HCT/3DlflgM1JOxiND8ZHnZBYFn1EH0RJ4oYPW/07QLgyJ7fAD5ovg7BKYmRxJ8FL18eDMs6o0nZeD5CtG8fG8dlB+j2SBLpom6ilpxqLH7e3vBF3Z412ZMc80Le3AgOYnD0jLIeHLeoXC5ngXKNHnfyCo2Q5bfuNELrzcz92fwBospMI+rklUT2daYxV8GdO2VYdyxs0bOQfCvoGtGX41Cka7AA4SMA0vLGu3efkOHsGaIfhsiCqe9VyTG8e1mdBwtiQ0APNX9oBUlL+wblk6LPTp7pbqd3x5jJy35cmKgmD82Kj/7HSkTdycUEyNVdGIxFzRnMWw8+oFNgca9U/cywIEuFZ3PXulzIWBu78VMSFyihMIDls/il3p94n/xo=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9e77e805-b485-4332-1b98-08d68c2980ef
X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Feb 2019 11:52:00.3034
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3743
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Razvan Stefanescu <razvan.stefanescu@nxp.com>

If the ethsw_port_init() call failed, the netdevice remains registered in
the system.

Use labels to ensure that netdevice is unregistered and freed in this case.

Signed-off-by: Razvan Stefanescu <razvan.stefanescu@nxp.com>
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
---
 drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/fsl-dpaa2/ethsw/ethsw.c b/drivers/staging/fsl-=
dpaa2/ethsw/ethsw.c
index d15d03b..fa3af4a 100644
--- a/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
+++ b/drivers/staging/fsl-dpaa2/ethsw/ethsw.c
@@ -1445,13 +1445,23 @@ static int ethsw_probe_port(struct ethsw_core *eths=
w, u16 port_idx)
 	err =3D register_netdev(port_netdev);
 	if (err < 0) {
 		dev_err(dev, "register_netdev error %d\n", err);
-		free_netdev(port_netdev);
-		return err;
+		goto err_register_netdev;
 	}
=20
 	ethsw->ports[port_idx] =3D port_priv;
=20
-	return ethsw_port_init(port_priv, port_idx);
+	err =3D ethsw_port_init(port_priv, port_idx);
+	if (err)
+		goto err_ethsw_port_init;
+
+	return 0;
+
+err_ethsw_port_init:
+	unregister_netdev(port_netdev);
+err_register_netdev:
+	free_netdev(port_netdev);
+
+	return err;
 }
=20
 static int ethsw_probe(struct fsl_mc_device *sw_dev)
--=20
1.9.1