git.openwrt.org Git - openwrt/staging/ansuel.git/blob

   1 Subject: [PATCH v2] netfilter: xtables: fix typo causing some targets to not load on IPv6
   2 Date: Sat, 19 Oct 2024 08:05:07 +0300   [thread overview]
   3 Message-ID: <20241019-xtables-typos-v2-1-6b8b1735dc8e@0upti.me> (raw)
   4
   5 These were added with the wrong family in 4cdc55e, which seems
   6 to just have been a typo, but now ip6tables rules with --set-mark
   7 don't work anymore, which is pretty bad.
   8
   9 Fixes: 0bfcb7b71e73 ("netfilter: xtables: avoid NFPROTO_UNSPEC where needed")
  10 Reviewed-by: Phil Sutter <phil@nwl.cc>
  11 Signed-off-by: Ilya Katsnelson <me@0upti.me>
  12 ---
  13 Changes in v2:
  14 - Fixed a typo in the commit message (that's karma).
  15 - Replaced a reference to backport commit.
  16 - Link to v1: https://lore.kernel.org/r/20241018-xtables-typos-v1-1-02a51789c0ec@0upti.me
  17 ---
  18  net/netfilter/xt_NFLOG.c | 2 +-
  19  net/netfilter/xt_mark.c  | 2 +-
  20  2 files changed, 2 insertions(+), 2 deletions(-)
  21
  22 --- a/net/netfilter/xt_NFLOG.c
  23 +++ b/net/netfilter/xt_NFLOG.c
  24 @@ -79,7 +79,7 @@ static struct xt_target nflog_tg_reg[] _
  25         {
  26                 .name       = "NFLOG",
  27                 .revision   = 0,
  28 -               .family     = NFPROTO_IPV4,
  29 +               .family     = NFPROTO_IPV6,
  30                 .checkentry = nflog_tg_check,
  31                 .destroy    = nflog_tg_destroy,
  32                 .target     = nflog_tg,
  33 --- a/net/netfilter/xt_mark.c
  34 +++ b/net/netfilter/xt_mark.c
  35 @@ -62,7 +62,7 @@ static struct xt_target mark_tg_reg[] __
  36         {
  37                 .name           = "MARK",
  38                 .revision       = 2,
  39 -               .family         = NFPROTO_IPV4,
  40 +               .family         = NFPROTO_IPV6,
  41                 .target         = mark_tg,
  42                 .targetsize     = sizeof(struct xt_mark_tginfo2),
  43                 .me             = THIS_MODULE,