Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp4564832rwb; Tue, 8 Nov 2022 19:57:33 -0800 (PST) X-Google-Smtp-Source: AMsMyM70dfHc4AIKRYNAEGJrZlLM9y3iUShslyfZC9A55dxi8MlvIUjvA2J07+lr4ao7YlzHqs3+ X-Received: by 2002:a05:6402:1e88:b0:461:a513:f543 with SMTP id f8-20020a0564021e8800b00461a513f543mr35786078edf.183.1667966253422; Tue, 08 Nov 2022 19:57:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667966253; cv=none; d=google.com; s=arc-20160816; b=Ostq8S89BO0FZ1ShPuhhjiJCukr5G9YmwND4yy8O3Djezh8icGcO1VrKr5Ew19Y7HD JSg3ta3QY9uU//U9+yCdQybA9voAhfk0irNzlGickNXrnwANEnR5RrUOlWhqvDMvtKwb gbTpBdiair+YygJQNDep6vY5axlXtdf7nFpJy8aTV5vBYbYxh+DmQ0l5KQMFMyEfTsI0 j4nYN0Q5s26x6RViavpyboLmm2amK/23jQQ2gxYZZRIDgAv9L6L1AY4X+XNV2Wud3uYW FVCob232twe7WYmuku0nNnPGqObr1s5akMPvAW55xuwreTAJ/WFZw6j0AJHc/Kh8uDsX azpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from; bh=yaRTzfMGqt4JQDOCnC/bdeWXERxrRG6SBVGQ0Y4hE/w=; b=RfhDKBuNwJVydqp4CS4lSOM7QIh8pzKl4p8dXuNQk5pUkLrwhk5FnFrHsovWo1fHsu zIK3Q5f6/4z1Dzb8o3LRT8Oar4HcsFAMIwAhcSeP26c5WZNbs9TqDn3I7VEAl7/TszCY o/D3JoAbETNbm6WxhJlGEBYGxpacQEFpXz/WjVtmu8v1wuAjSCV3/kh7Dg6/f8aHZP4H 1Boz9It7H1EkX3f06ct+rxQznY4/cv67cifa+iTEK5jjCJH83GOdfHSXWjIg/JMDr2TM TuM9MOu+0eyeT4+7ze67tYWChV8XxYNu63mA8R+ZttkyMXpqQNIy2kxOodzdhoVE2pUd jmkA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id oz14-20020a1709077d8e00b007ae1e635ea3si12344398ejc.754.2022.11.08.19.57.13; Tue, 08 Nov 2022 19:57:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230013AbiKIDza (ORCPT + 67 others); Tue, 8 Nov 2022 22:55:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229795AbiKIDz3 (ORCPT ); Tue, 8 Nov 2022 22:55:29 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 50B38175B4; Tue, 8 Nov 2022 19:55:28 -0800 (PST) Received: from dggpeml500023.china.huawei.com (unknown [172.30.72.57]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4N6WMT4pJKzRp1R; Wed, 9 Nov 2022 11:55:17 +0800 (CST) Received: from ubuntu1804.huawei.com (10.67.174.58) by dggpeml500023.china.huawei.com (7.185.36.114) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Wed, 9 Nov 2022 11:55:26 +0800 From: Xiu Jianfeng To: , , , , , , , , , , , CC: , Subject: [PATCH] wifi: iwlwifi: Fix memory leak in iwl_mvm_init() Date: Wed, 9 Nov 2022 11:52:13 +0800 Message-ID: <20221109035213.570-1-xiujianfeng@huawei.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.67.174.58] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpeml500023.china.huawei.com (7.185.36.114) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS 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: X-Mailing-List: linux-wireless@vger.kernel.org When iwl_opmode_register() fails, it does not unregster rate control, which will cause a memory leak issue, this patch fixes it. Fixes: 9f66a397c877 ("iwlwifi: mvm: rs: add ops for the new rate scaling in the FW") Signed-off-by: Xiu Jianfeng --- drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c index d2d42cd48af2..8374c2c3d31b 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c @@ -64,8 +64,10 @@ static int __init iwl_mvm_init(void) } ret = iwl_opmode_register("iwlmvm", &iwl_mvm_ops); - if (ret) + if (ret) { pr_err("Unable to register MVM op_mode: %d\n", ret); + iwl_mvm_rate_control_unregister(); + } return ret; } -- 2.17.1