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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D34CE6FE52 for ; Fri, 22 Sep 2023 16:03:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230443AbjIVQDK (ORCPT ); Fri, 22 Sep 2023 12:03:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230445AbjIVQDJ (ORCPT ); Fri, 22 Sep 2023 12:03:09 -0400 Received: from mail.netfilter.org (mail.netfilter.org [217.70.188.207]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 8F5C099; Fri, 22 Sep 2023 09:03:02 -0700 (PDT) From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: gregkh@linuxfoundation.org, sashal@kernel.org, stable@vger.kernel.org Subject: [PATCH -stable,6.5 0/5] Netfilter stable fixes for 6.5 Date: Fri, 22 Sep 2023 18:02:51 +0200 Message-Id: <20230922160256.150178-1-pablo@netfilter.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Hi Greg, Sasha, The following list shows patches that you can cherry-pick to -stable 6.5. I am using original commit IDs for reference: 1) 7ab9d0827af8 ("netfilter: nft_set_rbtree: use read spinlock to avoid datapath contention") 2) 4e5f5b47d8de ("netfilter: nft_set_pipapo: call nft_trans_gc_queue_sync() in catchall GC") 3) 1d16d80d4230 ("netfilter: nft_set_pipapo: stop GC iteration if GC transaction allocation fails") 4) 7606622f20da ("netfilter: nft_set_hash: try later when GC hits EAGAIN on iteration") 5) 44a76f08f7ca ("netfilter: nf_tables: fix memleak when more than 255 elements expired") Please, apply. Thanks. Florian Westphal (1): netfilter: nf_tables: fix memleak when more than 255 elements expired Pablo Neira Ayuso (4): netfilter: nft_set_rbtree: use read spinlock to avoid datapath contention netfilter: nft_set_pipapo: call nft_trans_gc_queue_sync() in catchall GC netfilter: nft_set_pipapo: stop GC iteration if GC transaction allocation fails netfilter: nft_set_hash: try later when GC hits EAGAIN on iteration include/net/netfilter/nf_tables.h | 7 ++++--- net/netfilter/nf_tables_api.c | 32 ++++++++++++++++++++++++++----- net/netfilter/nft_set_hash.c | 11 ++++------- net/netfilter/nft_set_pipapo.c | 4 ++-- net/netfilter/nft_set_rbtree.c | 8 +++----- 5 files changed, 40 insertions(+), 22 deletions(-) -- 2.30.2