From patchwork Thu Dec 29 16:35:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1720119 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=azazel.net header.i=@azazel.net header.a=rsa-sha256 header.s=20220717 header.b=hFKwwCyJ; dkim-atps=neutral Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by legolas.ozlabs.org (Postfix) with ESMTP id 4NjYsX0Ck7z23f4 for ; Fri, 30 Dec 2022 03:35:28 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233258AbiL2QfV (ORCPT ); Thu, 29 Dec 2022 11:35:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229735AbiL2QfT (ORCPT ); Thu, 29 Dec 2022 11:35:19 -0500 Received: from kadath.azazel.net (unknown [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F38511A32 for ; Thu, 29 Dec 2022 08:35:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20220717; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=Xc3pHBDf1gSIeCKkCeaLRbyNZ7TvxoacWyFrd7eG2YU=; b=hFKwwCyJ93phGvG31VbnDij2xE v35cbBfZceMRzl7XCJKcrM0J0gNVe8TkIC0f909IfE8yL7UXL/M93HlXtCpXe3dgIysntPyePkFTQ p8afyMDc+73JEVKwnejyL6pFhqN8R8aK1gYlJPj1DSRJ+SfQYxBNrCJJI/9FAfJuxgkxvJaZ/R2ZF sL8U2WDiuzUR8c6q0jtmhLhOIsi5+LcAQf4NP/EDlJpvdFevIVlGh7+QQNk+HxFEiauT8lAEnUyRU BIdQBEWEOmvzXuIJXxzp1HNa7zgsegvF6CmQespb0N2QtA8WkGvPN2RvzL2Ieq1Pv6O5olCKFhQut Je8xrZxQ==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pAvsA-00D08G-8H for netfilter-devel@vger.kernel.org; Thu, 29 Dec 2022 16:35:14 +0000 From: Jeremy Sowden To: Netfilter Devel Subject: [PATCH xtables-addons 1/3] build: replace obsolete `AC_PROG_LIBTOOL` macro with `LT_INIT` Date: Thu, 29 Dec 2022 16:35:05 +0000 Message-Id: <20221229163507.352888-2-jeremy@azazel.net> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221229163507.352888-1-jeremy@azazel.net> References: <20221229163507.352888-1-jeremy@azazel.net> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on kadath.azazel.net); SAEximRunCond expanded to false X-Spam-Status: No, score=-1.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RDNS_NONE,SPF_HELO_PASS, SPF_PASS autolearn=no 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: netfilter-devel@vger.kernel.org --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 549425742340..5d07a1026a20 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ AC_PROG_CC AM_PROG_CC_C_O m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) AC_DISABLE_STATIC -AC_PROG_LIBTOOL +LT_INIT AC_ARG_WITH([kbuild], AS_HELP_STRING([--with-kbuild=PATH], From patchwork Thu Dec 29 16:35:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1720120 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=azazel.net header.i=@azazel.net header.a=rsa-sha256 header.s=20220717 header.b=WhFQPooy; dkim-atps=neutral Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by legolas.ozlabs.org (Postfix) with ESMTP id 4NjYsX1lT4z23f6 for ; Fri, 30 Dec 2022 03:35:28 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229735AbiL2QfW (ORCPT ); Thu, 29 Dec 2022 11:35:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33384 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233335AbiL2QfT (ORCPT ); Thu, 29 Dec 2022 11:35:19 -0500 Received: from kadath.azazel.net (unknown [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F45311C15 for ; Thu, 29 Dec 2022 08:35:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20220717; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=vkZ5WaoCj4NrG3aNdH0ZXCQ34icspJ2yDFhr96cCH2Q=; b=WhFQPooy0Jad572yBbn8ydhAux 1i4sywYDmKcVuCx8bdsr8CWmPzlaL+Eugk2EyM7rhkLPl5675VbwTUlKz9yZLeOWGnLgoID5JHtpm gYK1uGfN0LXq0sJ3huANyf1WQrLKUEviriQIbwFUX3rSdeplTh0pv8l/MEdcvDMbdwDJ33w5hqKbs ajuptTg3jH4ngcU56RN/DgUAK/wB/LOCvweUyA0l/Z0KhOOMf8Rb/mmszJIhCUDgwZYVF7LgeuYsz T26duBcEXfD7LSeB2EqlBibu9TovtHvJQ7CzWGc8RDePWLLIITWGtOET3/P6Pa/Xy3kLOb4/6+3Dy NJaXbjVQ==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pAvsA-00D08G-BW for netfilter-devel@vger.kernel.org; Thu, 29 Dec 2022 16:35:14 +0000 From: Jeremy Sowden To: Netfilter Devel Subject: [PATCH xtables-addons 2/3] build: replace `AC_DISABLE_STATIC` macro with an argument to `LT_INIT` Date: Thu, 29 Dec 2022 16:35:06 +0000 Message-Id: <20221229163507.352888-3-jeremy@azazel.net> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221229163507.352888-1-jeremy@azazel.net> References: <20221229163507.352888-1-jeremy@azazel.net> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on kadath.azazel.net); SAEximRunCond expanded to false X-Spam-Status: No, score=-1.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RDNS_NONE,SPF_HELO_PASS, SPF_PASS autolearn=no 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: netfilter-devel@vger.kernel.org --- configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 5d07a1026a20..d582ca8e92d0 100644 --- a/configure.ac +++ b/configure.ac @@ -7,8 +7,7 @@ AM_INIT_AUTOMAKE([1.10b -Wall foreign subdir-objects]) AC_PROG_CC AM_PROG_CC_C_O m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) -AC_DISABLE_STATIC -LT_INIT +LT_INIT([disable-static]) AC_ARG_WITH([kbuild], AS_HELP_STRING([--with-kbuild=PATH], From patchwork Thu Dec 29 16:35:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1720121 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=azazel.net header.i=@azazel.net header.a=rsa-sha256 header.s=20220717 header.b=qxkGofjf; dkim-atps=neutral Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by legolas.ozlabs.org (Postfix) with ESMTP id 4NjYsX3N9Qz23fB for ; Fri, 30 Dec 2022 03:35:28 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233335AbiL2QfW (ORCPT ); Thu, 29 Dec 2022 11:35:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233476AbiL2QfT (ORCPT ); Thu, 29 Dec 2022 11:35:19 -0500 Received: from kadath.azazel.net (unknown [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F55311C26 for ; Thu, 29 Dec 2022 08:35:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20220717; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=szYfgaJSL7/lRHiZKa4OTMcLChpn2iPfLlMB9IzVyBA=; b=qxkGofjfk8cqRuRg6LAXwhuR6v mwYA0yltc/8qCK6+OANbGkWYb7hZSJW0T5lUp9IwL7aj/hN3XgJIHyiRaEaa00jukFWjOeoZmf+4h WcSpAmK6+8cAh5m7Jwb7QTih6F3twSgBgtmuQ6C2nbmmmLWZrvNjzPwPTQlHm47A7kaRAtHrglk7x ZebQ7s3ETpZaquz0Rzbi46UX/vU+knINFs6d+E4Ljm8GSBkLthvvDOYBkYZPTw+EX6s5HZbepLZa0 ByRpdf8e8o6PX+Bij5lLZYf2Zx8Fg7yKuMCeUZAJFGeLx4g7evc8CiYZ6yyngV9Tdh2YYAfpUJPBw exjFxRkw==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pAvsA-00D08G-Eq for netfilter-devel@vger.kernel.org; Thu, 29 Dec 2022 16:35:14 +0000 From: Jeremy Sowden To: Netfilter Devel Subject: [PATCH xtables-addons 3/3] build: support for Linux 6.2 Date: Thu, 29 Dec 2022 16:35:07 +0000 Message-Id: <20221229163507.352888-4-jeremy@azazel.net> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221229163507.352888-1-jeremy@azazel.net> References: <20221229163507.352888-1-jeremy@azazel.net> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on kadath.azazel.net); SAEximRunCond expanded to false X-Spam-Status: No, score=-1.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RDNS_NONE,SPF_HELO_PASS, SPF_PASS autolearn=no 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: netfilter-devel@vger.kernel.org `prandom_u32_max` was deprecated in favour of `get_random_u32_below`, and removed in 6.2-rc1. Replace the three occurrences of it in the TARPIT extension, and ad compat support for earlier kernels. Signed-off-by: Jeremy Sowden --- configure.ac | 2 +- extensions/compat_xtables.h | 4 ++++ extensions/xt_TARPIT.c | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index d582ca8e92d0..a13988ff4a4b 100644 --- a/configure.ac +++ b/configure.ac @@ -58,7 +58,7 @@ AS_IF([test -n "$kbuilddir"], [ yoff ], [ echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir"; - if test "$kmajor" -gt 6 -o "$kmajor" -eq 6 -a "$kminor" -gt 1; then + if test "$kmajor" -gt 6 -o "$kmajor" -eq 6 -a "$kminor" -gt 2; then yon echo "WARNING: That kernel version is not officially supported yet. Continue at own luck."; yoff diff --git a/extensions/compat_xtables.h b/extensions/compat_xtables.h index 1feea880057d..848d3bff50d8 100644 --- a/extensions/compat_xtables.h +++ b/extensions/compat_xtables.h @@ -48,4 +48,8 @@ static inline struct net *par_net(const struct xt_action_param *par) # define proc_release release #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 2, 0) +# define get_random_u32_below prandom_u32_max +#endif + extern void *HX_memmem(const void *, size_t, const void *, size_t); diff --git a/extensions/xt_TARPIT.c b/extensions/xt_TARPIT.c index 22e61255f5ca..c3875bc0f47f 100644 --- a/extensions/xt_TARPIT.c +++ b/extensions/xt_TARPIT.c @@ -107,8 +107,8 @@ static bool xttarpit_honeypot(struct tcphdr *tcph, const struct tcphdr *oth, tcph->syn = true; tcph->ack = true; tcph->window = oth->window & - (prandom_u32_max(0x20) - 0xf); - tcph->seq = htonl(prandom_u32_max(~oth->seq + 1)); + (get_random_u32_below(0x20) - 0xf); + tcph->seq = htonl(get_random_u32_below(~oth->seq + 1)); tcph->ack_seq = htonl(ntohl(oth->seq) + oth->syn); } @@ -117,7 +117,7 @@ static bool xttarpit_honeypot(struct tcphdr *tcph, const struct tcphdr *oth, tcph->syn = false; tcph->ack = true; tcph->window = oth->window & - (prandom_u32_max(0x20) - 0xf); + (get_random_u32_below(0x20) - 0xf); tcph->ack_seq = payload > 100 ? htonl(ntohl(oth->seq) + payload) : oth->seq;