37 lines
994 B
Diff
37 lines
994 B
Diff
|
From 34ea60b5b7645e96c600b8073dd82ac65144d711 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Phil Sutter <phil@nwl.cc>
|
||
|
|
Date: Thu, 12 Jan 2017 15:12:26 +0100
|
||
|
|
Subject: [iproute PATCH] tc: m_xt: Fix segfault with iptables-1.6.0
|
||
|
|
|
||
|
|
Said iptables version introduced struct xtables_globals field
|
||
|
|
'compat_rev', a function pointer. Initializing it is mandatory as
|
||
|
|
libxtables calls it without existence check.
|
||
|
|
|
||
|
|
Without this, tc segfaults when using the xt action like so:
|
||
|
|
|
||
|
|
| tc filter add dev d0 parent ffff: u32 match u32 0 0 \
|
||
|
|
| action xt -j MARK --set-mark 20
|
||
|
|
|
||
|
|
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
||
|
|
---
|
||
|
|
tc/m_xt.c | 3 +++
|
||
|
|
1 file changed, 3 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/tc/m_xt.c b/tc/m_xt.c
|
||
|
|
index dbb54981462ee..57ed40d7aa3a8 100644
|
||
|
|
--- a/tc/m_xt.c
|
||
|
|
+++ b/tc/m_xt.c
|
||
|
|
@@ -77,6 +77,9 @@ static struct xtables_globals tcipt_globals = {
|
||
|
|
.orig_opts = original_opts,
|
||
|
|
.opts = original_opts,
|
||
|
|
.exit_err = NULL,
|
||
|
|
+#if (XTABLES_VERSION_CODE >= 11)
|
||
|
|
+ .compat_rev = xtables_compatible_revision,
|
||
|
|
+#endif
|
||
|
|
};
|
||
|
|
|
||
|
|
/*
|
||
|
|
--
|
||
|
|
2.11.0
|
||
|
|
|