[xtables-addons][PATCH 0/2] Compatibility fixes for linux 4.14 and 4.15

[xtables-addons][PATCH 0/2] Compatibility fixes for linux 4.14 and 4.15

[Marcelo Henrique Cerri]

The following patches fix the build against 4.14 and 4.15 kernels.

Marcelo Henrique Cerri (1):
  build: support for Linux 4.15

Seth Forshee (1):
  build: support for Linux 4.14

 extensions/compat_xtables.h   |  4 ++++
 extensions/pknock/xt_pknock.c | 16 +++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

-- 
2.7.4

[xtables-addons][PATCH 1/2] build: support for Linux 4.14

[Marcelo Henrique Cerri]

From: Seth Forshee <seth.forshee@canonical.com>

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
---
 extensions/compat_xtables.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/extensions/compat_xtables.h b/extensions/compat_xtables.h
index d8882ac7670a..354884e15e1a 100644
--- a/extensions/compat_xtables.h
+++ b/extensions/compat_xtables.h
@@ -93,4 +93,8 @@ static inline struct net *par_net(const struct xt_action_param *par)
 #endif
 }
 
+#ifndef NF_CT_ASSERT
+#	define NF_CT_ASSERT(x)	WARN_ON(!(x))
+#endif
+
 #endif /* _XTABLES_COMPAT_H */
-- 
2.7.4

[xtables-addons][PATCH 2/2] build: support for Linux 4.15

[Marcelo Henrique Cerri]

Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
---
 extensions/pknock/xt_pknock.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/extensions/pknock/xt_pknock.c b/extensions/pknock/xt_pknock.c
index 6fbdea43321c..31d4bc8c9584 100644
--- a/extensions/pknock/xt_pknock.c
+++ b/extensions/pknock/xt_pknock.c
@@ -358,10 +358,20 @@ has_logged_during_this_minute(const struct peer *peer)
  * @r: rule
  */
 static void
-peer_gc(unsigned long r)
+peer_gc(
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
+	struct timer_list *tl
+#else
+	unsigned long r
+#endif
+)
 {
 	unsigned int i;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
+	struct xt_pknock_rule *rule = from_timer(rule, tl, timer);
+#else
 	struct xt_pknock_rule *rule = (struct xt_pknock_rule *)r;
+#endif
 	struct peer *peer;
 	struct list_head *pos, *n;
 
@@ -469,9 +479,13 @@ add_rule(struct xt_pknock_mtinfo *info)
 	if (rule->peer_head == NULL)
 		goto out;
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
+	timer_setup(&rule->timer, peer_gc, 0);
+#else
 	init_timer(&rule->timer);
 	rule->timer.function	= peer_gc;
 	rule->timer.data	= (unsigned long)rule;
+#endif
 
 	rule->status_proc = proc_create_data(info->rule_name, 0, pde,
 	                    &pknock_proc_ops, rule);
-- 
2.7.4

Re: [xtables-addons][PATCH 0/2] Compatibility fixes for linux 4.14 and 4.15

[Jan Engelhardt]

On Thursday 2018-01-04 18:50, Marcelo Henrique Cerri wrote:

>The following patches fix the build against 4.14 and 4.15 kernels.

Added.