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 0bfcb7b71e73, 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: 0bfcb7b71e73 ("netfilter: xtables: avoid NFPROTO_UNSPEC where needed")
Reviewed-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Ilya Katsnelson <me@0upti.me>
Cherry-picked-for: https://gitlab.archlinux.org/archlinux/packaging/packages/linux/-/issues/87
This commit is contained in:
Ilya Katsnelson 2024-10-19 21:18:38 +03:00 committed by Jan Alexander Steffens (heftig)
parent eb79c5cee0
commit a953a92310
No known key found for this signature in database
GPG key ID: B8AC08600F108CDF
3 changed files with 3 additions and 2 deletions

View file

@ -79,7 +79,7 @@ static struct xt_target nflog_tg_reg[] __read_mostly = {
{
.name = "NFLOG",
.revision = 0,
.family = NFPROTO_IPV4,
.family = NFPROTO_IPV6,
.checkentry = nflog_tg_check,
.destroy = nflog_tg_destroy,
.target = nflog_tg,

View file

@ -49,6 +49,7 @@ static struct xt_target trace_tg_reg[] __read_mostly = {
.target = trace_tg,
.checkentry = trace_tg_check,
.destroy = trace_tg_destroy,
.me = THIS_MODULE,
},
#endif
};

View file

@ -62,7 +62,7 @@ static struct xt_target mark_tg_reg[] __read_mostly = {
{
.name = "MARK",
.revision = 2,
.family = NFPROTO_IPV4,
.family = NFPROTO_IPV6,
.target = mark_tg,
.targetsize = sizeof(struct xt_mark_tginfo2),
.me = THIS_MODULE,