nft: Drop interface mask leftovers from post_parse callbacks

Fixed commit only adjusted the IPv4-specific callback for unclear
reasons.

Fixes: fe70364b36119 ("xshared: Do not populate interface masks per default")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Reviewed-by: Jeremy Sowden <jeremy@azazel.net>

diff --git a/iptables/nft-arp.c b/iptables/nft-arp.c
index c11d64c368638dc71194e1d8044959c28a11582e..fa2dd558b1f89c45b10d570ab09f9b07a6bb7e8b 100644 (file)
--- a/iptables/nft-arp.c
+++ b/iptables/nft-arp.c
@@ -459,10 +459,7 @@ static void nft_arp_post_parse(int command,
        cs->arp.arp.invflags = args->invflags;
 
        memcpy(cs->arp.arp.iniface, args->iniface, IFNAMSIZ);
-       memcpy(cs->arp.arp.iniface_mask, args->iniface_mask, IFNAMSIZ);
-
        memcpy(cs->arp.arp.outiface, args->outiface, IFNAMSIZ);
-       memcpy(cs->arp.arp.outiface_mask, args->outiface_mask, IFNAMSIZ);
 
        cs->arp.counters.pcnt = args->pcnt_cnt;
        cs->arp.counters.bcnt = args->bcnt_cnt;

diff --git a/iptables/xshared.c b/iptables/xshared.c
index 2a5eef09c75deaf9a888f6fc8eb4bd5c3b9b3ab5..2f663f9762016d0768baa13ea5e47c002ed4783b 100644 (file)
--- a/iptables/xshared.c
+++ b/iptables/xshared.c
@@ -2104,12 +2104,7 @@ void ipv6_post_parse(int command, struct iptables_command_state *cs,
        cs->fw6.ipv6.invflags = args->invflags;
 
        memcpy(cs->fw6.ipv6.iniface, args->iniface, IFNAMSIZ);
-       memcpy(cs->fw6.ipv6.iniface_mask,
-              args->iniface_mask, IFNAMSIZ*sizeof(unsigned char));
-
        memcpy(cs->fw6.ipv6.outiface, args->outiface, IFNAMSIZ);
-       memcpy(cs->fw6.ipv6.outiface_mask,
-              args->outiface_mask, IFNAMSIZ*sizeof(unsigned char));
 
        if (args->goto_set)
                cs->fw6.ipv6.flags |= IP6T_F_GOTO;

diff --git a/iptables/xshared.h b/iptables/xshared.h
index a111e79793b546ecd83e42462d5941c96a274283..af756738e7c440e4bf6ab3a7e98ab116c14d3a5e 100644 (file)
--- a/iptables/xshared.h
+++ b/iptables/xshared.h
@@ -262,7 +262,6 @@ struct xtables_args {
        uint8_t         flags;
        uint16_t        invflags;
        char            iniface[IFNAMSIZ], outiface[IFNAMSIZ];
-       unsigned char   iniface_mask[IFNAMSIZ], outiface_mask[IFNAMSIZ];
        char            bri_iniface[IFNAMSIZ], bri_outiface[IFNAMSIZ];
        bool            goto_set;
        const char      *shostnetworkmask, *dhostnetworkmask;