Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Minjie Du <duminjie@vivo.com>
To:     anton.ivanov@cambridgegreys.com,
        Richard Weinberger <richard@nod.at>,
        Johannes Berg <johannes@sipsolutions.net>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        linux-um@lists.infradead.org (open list:USER-MODE LINUX (UML)),
        linux-kernel@vger.kernel.org (open list),
        bpf@vger.kernel.org (open list:BPF [MISC])
Cc:     opensource.kernel@vivo.com, Minjie Du <duminjie@vivo.com>
Subject: [PATCH v4] um: vector: Fix exception handling in vector_eth_configure()
Date:   Thu,  6 Jul 2023 09:39:10 +0800
Message-Id: <20230706013911.695-1-duminjie@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?vvIMbCl0zlLC6OTyEF0IOx5CACvOj6f5Iwpac8X0lybmUMthxJuyYHbCPa8H?=
 =?us-ascii?Q?hVbxGeivlR8wqPDbg8DInS1fIzNpf0jMoJkKBW1wN0IRa0mvpzRNRiKWJAxP?=
 =?us-ascii?Q?nDABWGoHztILW/UCUpJGyLQAJTyCenmZq+/KaxXP/IAAkkXinWEVq397Kv4Q?=
 =?us-ascii?Q?fstYIzSPhoVS1qATVHhEd4T0r1K0ltgNKRmOQP3NWtb7btXEphvjxAlZ79/t?=
 =?us-ascii?Q?NMzyd8XfUx2ijYMg4vNtFcp98rU3XN/7uVBI4NN+MyxsYEo+T6sV2WifMNcF?=
 =?us-ascii?Q?fey0ocf4ThfUqn/f0ZYc9QiJKC0n+waA3asOIExbTuHxnyogVatyBG6eEXl7?=
 =?us-ascii?Q?2dt3PFRDiKCM39Kks1qTTNDqjsF4uRhBhqlipLHeESVZZ4gR0j3U/vSgOdkj?=
 =?us-ascii?Q?n3H7zHPZS7J9YxvGtjhvONEdrqeMi8Dquk88Rn7KNphq1l0N3Knhlje86uLY?=
 =?us-ascii?Q?PnzBrVZPl4yny2VncSDZVgs+TVpm7HIO5a9XkxC8IUlk58ohGlBDPQBgpEHo?=
 =?us-ascii?Q?8pHo2Qor1ut4Md3RsPN2c+wjmicI6fG+VlRFfonIqPwNaZjKzMlHkQgrGZja?=
 =?us-ascii?Q?tMciYW5Fy5BhTUtwdoVCUAknINsRW4Efbyw/IdRtx5tf6IicAD4CM5r6l0h0?=
 =?us-ascii?Q?bBZjHyilU32HbW4Oz1Ctf5B+OGt4MohZFt0jUpEICbGSbhPFCw2BhzRW0Ni/?=
 =?us-ascii?Q?53rst9OC8LxPj8EsPRTPFBNtTkmHVTsODYpvEh6PqIVvkFn3jSM3RUGti5zi?=
 =?us-ascii?Q?DYOg2OdE9XwJKn3M3Q8STDF/179gwZ8A2tw6M0vLsr6F9mb4Dk7YUh5oTft8?=
 =?us-ascii?Q?W3+1RseycuSg/ZtHAMpVlwKti0N+FnhiAc4H09ByXbUKAOPLy5EuFpsmuKbU?=
 =?us-ascii?Q?WnROwjYbcQRjkfXKoc+CzouhRneTBMc8he8RdFC8sXUvfNxQeFqVbq3ppdrF?=
 =?us-ascii?Q?PGendAIeV1YEUYiEtJkl4lP5Um9xD8FIatHC2O7EEgJsrqaZbNPDQeYFCDYk?=
 =?us-ascii?Q?7uu893oofUM9W+O65rA+2BAr+Q93dCWw9yG/uFMRXCQfELfjDR7hPZwZ6VyI?=
 =?us-ascii?Q?6VTk+PMz96cfehlHMqyhSRlmWjRyDlGre2RtwKTQHiNweN3K7N11Bzeg5FxQ?=
 =?us-ascii?Q?QAIkTN21wgSYDtjq4VFFtWTzxljrRRCbHzuHt+A0QcoQqMbBoW8EJlJiOKeX?=
 =?us-ascii?Q?Sj4AM5oEk5XaCb4RWrl/NFJ/Z2pzf6VDc3UHpAWO3PCi4Qf8N7uzx64jmeYl?=
 =?us-ascii?Q?MHtpp1+DroSNCF1ueQaVadhAIF2gsOAcQEhnXNNuYccQLFqeKltVa6CdAY7G?=
 =?us-ascii?Q?6Wlj2aYejByALOeh1bs8L5Xpu1wpJXE5NEuJX5RAYVpVjmfX3+ja5FqUW2ck?=
 =?us-ascii?Q?h06ASilnk2NXe4FOS1W2ZAQMxg/sSqJdX8qjrVchF3JxuE1ClanOBb9p3i6n?=
 =?us-ascii?Q?tyzJDrMZt6zLRiVrGEsKCIvm59hbk82Tq6dNbtBDKRL9WzKeVmwgUReeXbm0?=
 =?us-ascii?Q?sD+qze3hzThqGMO0iL1E4ZL+ueOrrlh/DvO1UQ2IEwbwlVJx8DXyvO9dPPSg?=
 =?us-ascii?Q?Ajfx6pxjWEsZw2wkRDkgB57x2I5wIVpMfEhfIfR2?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8290e036-cf62-4104-cacd-08db7dc1d661
X-MS-Exchange-CrossTenant-AuthSource: SG2PR06MB5288.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jul 2023 01:39:28.3586
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: /wG8LuwrvbK8nqKFHqJaiZKsTpKRWiKl2OTnLvXjqBzmh8avPxBFisYWUs0LXgNXgBhhxJxLqGkdTQB5P14AJg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2PR06MB4010
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The resource cleanup was incomplete in the implementation 
of the function "vector_eth_configure".
Thus replace the jump target
"out_undo_user_init" by "out_free_netdev".
Delate the orphan function "out_undo_user_init"

PATCH v1-v3: Modify the patch format.

Signed-off-by: Minjie Du <duminjie@vivo.com>
---
 arch/um/drivers/vector_kern.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/um/drivers/vector_kern.c b/arch/um/drivers/vector_kern.c
index 131b7cb29..7ae6ab8df 100644
--- a/arch/um/drivers/vector_kern.c
+++ b/arch/um/drivers/vector_kern.c
@@ -1646,7 +1646,7 @@ static void vector_eth_configure(
 	err = register_netdevice(dev);
 	rtnl_unlock();
 	if (err)
-		goto out_undo_user_init;
+		goto out_free_netdev;
 
 	spin_lock(&vector_devices_lock);
 	list_add(&device->list, &vector_devices);
@@ -1654,8 +1654,6 @@ static void vector_eth_configure(
 
 	return;
 
-out_undo_user_init:
-	return;
 out_free_netdev:
 	free_netdev(dev);
 out_free_device:
-- 
2.39.0