From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B62D1C4363A for ; Tue, 27 Oct 2020 17:12:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6640B20732 for ; Tue, 27 Oct 2020 17:12:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603818758; bh=NtXoIMJCeTROgKuaHm67EDwfKRS+kP49fIqYA68hxQs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=QuI0YLjGL9D0WfhNrlgmyPTSTdKuCW8t0GjFC2V5Fq0ewx4tr6lIjV0nFPUHCkEMs WKOvkdW55uFMHWfoxl5SrlijF2ZpIQncjECizcVB9K7BptjKXoU1N30igNbOvRixS/ yMXL7b5xR4Blz92mZgkF88apyAEThspK9kdY6L0w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1817066AbgJ0RMg (ORCPT ); Tue, 27 Oct 2020 13:12:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:33144 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1785104AbgJ0O7o (ORCPT ); Tue, 27 Oct 2020 10:59:44 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3D7E920714; Tue, 27 Oct 2020 14:59:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603810783; bh=NtXoIMJCeTROgKuaHm67EDwfKRS+kP49fIqYA68hxQs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eG3ngfh+gIEBj7ZTKWz3RpdDz6bBgU+i+XgVY8IKvPdeWiHr7JKvIh+/8Cdzipyr3 +urcbxDWISKnlzBWWnaCxCLuWKKCRnPw3M3kFkfcvCAFBfPzCblRx0Hw8IKrhSygKd V6JACTEZjUQY//agykszmjMH8NI2tngy+IGcy8dQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , Huang Guobin , Kalle Valo , Sasha Levin Subject: [PATCH 5.8 245/633] net: wilc1000: clean up resource in error path of init mon interface Date: Tue, 27 Oct 2020 14:49:48 +0100 Message-Id: <20201027135534.168133078@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135522.655719020@linuxfoundation.org> References: <20201027135522.655719020@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: Huang Guobin [ Upstream commit 55bd149978679742374c800e56e8f6bc74378bbe ] The wilc_wfi_init_mon_int() forgets to clean up resource when register_netdevice() failed. Add the missed call to fix it. And the return value of netdev_priv can't be NULL, so remove the unnecessary error handling. Fixes: 588713006ea4 ("staging: wilc1000: avoid the use of 'wilc_wfi_mon' static variable") Reported-by: Hulk Robot Signed-off-by: Huang Guobin Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/20200917123019.206382-1-huangguobin4@huawei.com Signed-off-by: Sasha Levin --- drivers/staging/wilc1000/mon.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/wilc1000/mon.c b/drivers/staging/wilc1000/mon.c index 60331417bd983..66f1c870f4f69 100644 --- a/drivers/staging/wilc1000/mon.c +++ b/drivers/staging/wilc1000/mon.c @@ -236,11 +236,10 @@ struct net_device *wilc_wfi_init_mon_interface(struct wilc *wl, if (register_netdevice(wl->monitor_dev)) { netdev_err(real_dev, "register_netdevice failed\n"); + free_netdev(wl->monitor_dev); return NULL; } priv = netdev_priv(wl->monitor_dev); - if (!priv) - return NULL; priv->real_ndev = real_dev; -- 2.25.1