Skip to content

Commit 9574cc7

Browse files
K900heftig
authored andcommitted
netfilter: xtables: fix a bunch of typos causing some targets to not load on IPv6
The xt_NFLOG and xt_MARK changes were added with the wrong family in 0bfcb7b, which seems to just have been a typo, but now ip6tables rules with --set-mark don't work anymore, which is pretty bad. Pablo spotted another typo introduced in the same commit in xt_TRACE. Fixes: 0bfcb7b ("netfilter: xtables: avoid NFPROTO_UNSPEC where needed") Reviewed-by: Phil Sutter <[email protected]> Signed-off-by: Ilya Katsnelson <[email protected]> Cherry-picked-for: https://gitlab.archlinux.org/archlinux/packaging/packages/linux/-/issues/87
1 parent 52c9ab5 commit 9574cc7

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

net/netfilter/xt_NFLOG.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ static struct xt_target nflog_tg_reg[] __read_mostly = {
7979
{
8080
.name = "NFLOG",
8181
.revision = 0,
82-
.family = NFPROTO_IPV4,
82+
.family = NFPROTO_IPV6,
8383
.checkentry = nflog_tg_check,
8484
.destroy = nflog_tg_destroy,
8585
.target = nflog_tg,

net/netfilter/xt_TRACE.c

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ static struct xt_target trace_tg_reg[] __read_mostly = {
4949
.target = trace_tg,
5050
.checkentry = trace_tg_check,
5151
.destroy = trace_tg_destroy,
52+
.me = THIS_MODULE,
5253
},
5354
#endif
5455
};

net/netfilter/xt_mark.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ static struct xt_target mark_tg_reg[] __read_mostly = {
6262
{
6363
.name = "MARK",
6464
.revision = 2,
65-
.family = NFPROTO_IPV4,
65+
.family = NFPROTO_IPV6,
6666
.target = mark_tg,
6767
.targetsize = sizeof(struct xt_mark_tginfo2),
6868
.me = THIS_MODULE,

0 commit comments

Comments
 (0)