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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 17F24C2B9F4 for ; Mon, 28 Jun 2021 13:24:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E237A6192F for ; Mon, 28 Jun 2021 13:24:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233171AbhF1N0r (ORCPT ); Mon, 28 Jun 2021 09:26:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49764 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232507AbhF1N0l (ORCPT ); Mon, 28 Jun 2021 09:26:41 -0400 Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C65F3C061574; Mon, 28 Jun 2021 06:24:15 -0700 (PDT) Received: by mail-pl1-x62d.google.com with SMTP id x22so8918368pll.11; Mon, 28 Jun 2021 06:24:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=QDHeI0eWYReS8YY9gGFnBiWrL9nGbp9CaS3tGTpgWPY=; b=tDbFTge6qf17tfEg5ZBR1GUf5B5LigcdxkXl8zhCnzpY5UmGfii5jeYzCy+JIuOgaK w6xmQJTqvBlmEzJ371uOXvH8rhLd9/0bdPiRpSod5JNujJ7p6om0vhdcCf+bM1MEFDy8 YaDoYcnlSWaXFvxwHt6I0NgYIfhwIzXCfUN+y+inuIE0DK7wdRXvrqe3a7okTfNaSee3 /rG/hQzhURZEEfQgKKTQyDCUQXrC6mkLG3qCnTgcaJKOQksKx4y57EbGPINl28ztyqAX UEdNpVJ0ugPtdtguiEbpUGSkS0cXX5lTkXIcKIDSdux+oRk0zFfk89RJbiQGokIYwtUC Xx6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=QDHeI0eWYReS8YY9gGFnBiWrL9nGbp9CaS3tGTpgWPY=; b=Q8Ey4kfbupCNb7XPLlTyhJP5qm27CM9xigSmvG2uHCBA3kCoZp0qIT9N5NxGKWR9Bh AEEstN4dfbHsmcGZPNcWvDN6fkjU47yhNNivhyCJV44fgb3EjququSlGjoOGcLZVG0Eq LHOewwrmlDAAQ7oMUy61JCXOQKPX16k5kmHpQst2y+zOaLATnnERZb4xNoaqnORiXtYd +0B+CkTiVCM5dwnEpRnMhd9RF2Q/DK6u8BjAiYGCFwQm37ZaShHSDKAlsK2AWAiH/01y z+1eKlNBmIifJIc++JM+aUetsRdu0G+9B7UzcYTri8QUgFq7TLyI1z6w50+4e/PU0kFt DxmQ== X-Gm-Message-State: AOAM530Q6i7TY92Vmt/7Xdf8YI79MlvILAx0LokLNanWA1l4Uh0IYv/U BOPpDLsae6WfACPi2Pv7ZP4= X-Google-Smtp-Source: ABdhPJyEtBkT4U1E1c9TE1NUy5w+z2T4i2Fn9JFuaijGI3lm8CCha1Sn2Gjr4SEhAJ+fNJdQ/XmVeA== X-Received: by 2002:a17:90a:c8b:: with SMTP id v11mr36896213pja.114.1624886654848; Mon, 28 Jun 2021 06:24:14 -0700 (PDT) Received: from pn-hyperv.lan (bb42-60-144-185.singnet.com.sg. [42.60.144.185]) by smtp.gmail.com with ESMTPSA id i18sm2738268pfa.37.2021.06.28.06.24.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jun 2021 06:24:14 -0700 (PDT) From: Nguyen Dinh Phi To: johannes@sipsolutions.net, davem@davemloft.net, kuba@kernel.org Cc: Nguyen Dinh Phi , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kernel-mentees@lists.linuxfoundation.org Subject: [PATCH V2] cfg80211: Fix possible memory leak in function cfg80211_bss_update Date: Mon, 28 Jun 2021 21:23:34 +0800 Message-Id: <20210628132334.851095-1-phind.uet@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org When we exceed the limit of BSS entries, this function will free the new entry, however, at this time, it is the last door to access the inputed ies, so these ies will be unreferenced objects and cause memory leak. Therefore we should free its ies before deallocating the new entry, beside of dropping it from hidden_list. Signed-off-by: Nguyen Dinh Phi --- V2: - Add subsystem to the subject line. - Use bss_ref_put function for better clean-up dynamically allocated cfg80211_internal_bss objects. It helps to clean relative hidden_bss. net/wireless/scan.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net/wireless/scan.c b/net/wireless/scan.c index f03c7ac8e184..7897b1478c3c 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -1754,16 +1754,14 @@ cfg80211_bss_update(struct cfg80211_registered_device *rdev, * be grouped with this beacon for updates ... */ if (!cfg80211_combine_bsses(rdev, new)) { - kfree(new); + bss_ref_put(rdev, new); goto drop; } } if (rdev->bss_entries >= bss_entries_limit && !cfg80211_bss_expire_oldest(rdev)) { - if (!list_empty(&new->hidden_list)) - list_del(&new->hidden_list); - kfree(new); + bss_ref_put(rdev, new); goto drop; } -- 2.25.1 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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,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 EC160C49361 for ; Mon, 28 Jun 2021 13:24:18 +0000 (UTC) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 97BB161A1D for ; Mon, 28 Jun 2021 13:24:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 97BB161A1D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-kernel-mentees-bounces@lists.linuxfoundation.org Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 723AF833AE; Mon, 28 Jun 2021 13:24:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HDu_DV0qWJkv; Mon, 28 Jun 2021 13:24:17 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id 898018338B; Mon, 28 Jun 2021 13:24:17 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 6EB5DC0010; Mon, 28 Jun 2021 13:24:17 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 2A1FCC000E for ; Mon, 28 Jun 2021 13:24:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 183A360724 for ; Mon, 28 Jun 2021 13:24:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fcx2kRiiay6G for ; Mon, 28 Jun 2021 13:24:15 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by smtp3.osuosl.org (Postfix) with ESMTPS id 6A6236060E for ; Mon, 28 Jun 2021 13:24:15 +0000 (UTC) Received: by mail-pl1-x62f.google.com with SMTP id o3so3837412plg.4 for ; Mon, 28 Jun 2021 06:24:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=QDHeI0eWYReS8YY9gGFnBiWrL9nGbp9CaS3tGTpgWPY=; b=tDbFTge6qf17tfEg5ZBR1GUf5B5LigcdxkXl8zhCnzpY5UmGfii5jeYzCy+JIuOgaK w6xmQJTqvBlmEzJ371uOXvH8rhLd9/0bdPiRpSod5JNujJ7p6om0vhdcCf+bM1MEFDy8 YaDoYcnlSWaXFvxwHt6I0NgYIfhwIzXCfUN+y+inuIE0DK7wdRXvrqe3a7okTfNaSee3 /rG/hQzhURZEEfQgKKTQyDCUQXrC6mkLG3qCnTgcaJKOQksKx4y57EbGPINl28ztyqAX UEdNpVJ0ugPtdtguiEbpUGSkS0cXX5lTkXIcKIDSdux+oRk0zFfk89RJbiQGokIYwtUC Xx6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=QDHeI0eWYReS8YY9gGFnBiWrL9nGbp9CaS3tGTpgWPY=; b=M5ejjU8u9sJvzs/CK9CB2S7RsXXwRlaUqUtC8cXY5YUcBxsvY9Sm5l43YeROMY122U apiTmLAUXS9uJBRPkdWULpMM6sCa0invR8KqpJ0Ls6IFMq8RKPcjMCKrwnOhqq2SqKZb otqeEYnZRPPhC9L7tZBcO+Vrbg8WcMMy5KdADze2kT6a+OeWenGQjC5fmQ3SNAFZSOKk JXfAFRVtojcrxWyHPZmPdJuIDfJWzoNl1PeymzA5wvoJHQMaDWQ/e8Qq10A0giGrKhjt A3IpOpGd8dNWRvl9sXyrRepy0IGHJJoNhLiFdS6NmOODrYbMk8OCG1/1qoAfC1qitiOF fSTA== X-Gm-Message-State: AOAM530XwKkB9O1cy0QIjTSdXwRdgKk8x7bn4gpgK9BgmNfg5V5QnkgO JLJ4zneVXKTZ88WhAASdjLk= X-Google-Smtp-Source: ABdhPJyEtBkT4U1E1c9TE1NUy5w+z2T4i2Fn9JFuaijGI3lm8CCha1Sn2Gjr4SEhAJ+fNJdQ/XmVeA== X-Received: by 2002:a17:90a:c8b:: with SMTP id v11mr36896213pja.114.1624886654848; Mon, 28 Jun 2021 06:24:14 -0700 (PDT) Received: from pn-hyperv.lan (bb42-60-144-185.singnet.com.sg. [42.60.144.185]) by smtp.gmail.com with ESMTPSA id i18sm2738268pfa.37.2021.06.28.06.24.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jun 2021 06:24:14 -0700 (PDT) From: Nguyen Dinh Phi To: johannes@sipsolutions.net, davem@davemloft.net, kuba@kernel.org Subject: [PATCH V2] cfg80211: Fix possible memory leak in function cfg80211_bss_update Date: Mon, 28 Jun 2021 21:23:34 +0800 Message-Id: <20210628132334.851095-1-phind.uet@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Cc: netdev@vger.kernel.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kernel-mentees@lists.linuxfoundation.org X-BeenThere: linux-kernel-mentees@lists.linuxfoundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-kernel-mentees-bounces@lists.linuxfoundation.org Sender: "Linux-kernel-mentees" When we exceed the limit of BSS entries, this function will free the new entry, however, at this time, it is the last door to access the inputed ies, so these ies will be unreferenced objects and cause memory leak. Therefore we should free its ies before deallocating the new entry, beside of dropping it from hidden_list. Signed-off-by: Nguyen Dinh Phi --- V2: - Add subsystem to the subject line. - Use bss_ref_put function for better clean-up dynamically allocated cfg80211_internal_bss objects. It helps to clean relative hidden_bss. net/wireless/scan.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net/wireless/scan.c b/net/wireless/scan.c index f03c7ac8e184..7897b1478c3c 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -1754,16 +1754,14 @@ cfg80211_bss_update(struct cfg80211_registered_device *rdev, * be grouped with this beacon for updates ... */ if (!cfg80211_combine_bsses(rdev, new)) { - kfree(new); + bss_ref_put(rdev, new); goto drop; } } if (rdev->bss_entries >= bss_entries_limit && !cfg80211_bss_expire_oldest(rdev)) { - if (!list_empty(&new->hidden_list)) - list_del(&new->hidden_list); - kfree(new); + bss_ref_put(rdev, new); goto drop; } -- 2.25.1 _______________________________________________ Linux-kernel-mentees mailing list Linux-kernel-mentees@lists.linuxfoundation.org https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees