nft-bridge: fix inversion of builtin matches

This patch fixes inversion of builtin matches by updating the use of add_*()
functions and using nft_invflags2cmp() as well.

Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/iptables/nft-bridge.c b/iptables/nft-bridge.c
index 3ed6239847613aa64147778a4cb2331167e4c1cc..b5aec0010b866288e2626f7889057ca57dda8995 100644 (file)
--- a/iptables/nft-bridge.c
+++ b/iptables/nft-bridge.c
@@ -64,22 +64,6 @@ static void ebt_print_mac_and_mask(const unsigned char *mac, const unsigned char
        }
 }
 
-static uint8_t ebt_to_ipt_flags(uint16_t invflags)
-{
-       uint8_t result = 0;
-
-       if (invflags & EBT_IIN)
-               result |= IPT_INV_VIA_IN;
-
-       if (invflags & EBT_IOUT)
-               result |= IPT_INV_VIA_OUT;
-
-       if (invflags & EBT_IPROTO)
-               result |= IPT_INV_PROTO;
-
-       return result;
-}
-
 static uint16_t ipt_to_ebt_flags(uint8_t invflags)
 {
        uint16_t result = 0;
@@ -96,18 +80,12 @@ static uint16_t ipt_to_ebt_flags(uint8_t invflags)
        return result;
 }
 
-static void add_logical_iniface(struct nft_rule *r, char *iface, int invflags)
+static void add_logical_iniface(struct nft_rule *r, char *iface, uint32_t op)
 {
        int iface_len;
-       uint32_t op;
 
        iface_len = strlen(iface);
 
-       if (invflags & EBT_ILOGICALIN)
-               op = NFT_CMP_NEQ;
-       else
-               op = NFT_CMP_EQ;
-
        add_meta(r, NFT_META_BRI_IIFNAME);
        if (iface[iface_len - 1] == '+')
                add_cmp_ptr(r, op, iface, iface_len - 1);
@@ -115,18 +93,12 @@ static void add_logical_iniface(struct nft_rule *r, char *iface, int invflags)
                add_cmp_ptr(r, op, iface, iface_len + 1);
 }
 
-static void add_logical_outiface(struct nft_rule *r, char *iface, int invflags)
+static void add_logical_outiface(struct nft_rule *r, char *iface, uint32_t op)
 {
        int iface_len;
-       uint32_t op;
 
        iface_len = strlen(iface);
 
-       if (invflags & EBT_ILOGICALOUT)
-               op = NFT_CMP_NEQ;
-       else
-               op = NFT_CMP_EQ;
-
        add_meta(r, NFT_META_BRI_OIFNAME);
        if (iface[iface_len - 1] == '+')
                add_cmp_ptr(r, op, iface, iface_len - 1);
@@ -164,36 +136,47 @@ static int nft_bridge_add(struct nft_rule *r, void *data)
 {
        struct ebtables_command_state *cs = data;
        struct ebt_entry *fw = &cs->fw;
-       uint8_t flags = ebt_to_ipt_flags(fw->invflags);
+       uint32_t op;
        char *addr;
 
-       if (fw->in[0] != '\0')
-               add_iniface(r, fw->in, flags);
+       if (fw->in[0] != '\0') {
+               op = nft_invflags2cmp(fw->invflags, EBT_IIN);
+               add_iniface(r, fw->in, op);
+       }
 
-       if (fw->out[0] != '\0')
-               add_outiface(r, fw->out, flags);
+       if (fw->out[0] != '\0') {
+               op = nft_invflags2cmp(fw->invflags, EBT_IOUT);
+               add_outiface(r, fw->out, op);
+       }
 
-       if (fw->logical_in[0] != '\0')
-               add_logical_iniface(r, fw->logical_in, flags);
+       if (fw->logical_in[0] != '\0') {
+               op = nft_invflags2cmp(fw->invflags, EBT_ILOGICALIN);
+               add_logical_iniface(r, fw->logical_in, op);
+       }
 
-       if (fw->logical_out[0] != '\0')
-               add_logical_outiface(r, fw->logical_out, flags);
+       if (fw->logical_out[0] != '\0') {
+               op = nft_invflags2cmp(fw->invflags, EBT_ILOGICALOUT);
+               add_logical_outiface(r, fw->logical_out, op);
+       }
 
        addr = ether_ntoa((struct ether_addr *) fw->sourcemac);
        if (strcmp(addr, "0:0:0:0:0:0") != 0) {
+               op = nft_invflags2cmp(fw->invflags, EBT_ISOURCE);
                add_payload(r, offsetof(struct ethhdr, h_source), 6);
-               add_cmp_ptr(r, NFT_CMP_EQ, fw->sourcemac, 6);
+               add_cmp_ptr(r, op, fw->sourcemac, 6);
        }
 
        addr = ether_ntoa((struct ether_addr *) fw->destmac);
        if (strcmp(addr, "0:0:0:0:0:0") != 0) {
+               op = nft_invflags2cmp(fw->invflags, EBT_IDEST);
                add_payload(r, offsetof(struct ethhdr, h_dest), 6);
-               add_cmp_ptr(r, NFT_CMP_EQ, fw->destmac, 6);
+               add_cmp_ptr(r, op, fw->destmac, 6);
        }
 
        if (fw->ethproto != 0) {
+               op = nft_invflags2cmp(fw->invflags, EBT_IPROTO);
                add_payload(r, offsetof(struct ethhdr, h_proto), 2);
-               add_cmp_u16(r, fw->ethproto, NFT_CMP_EQ);
+               add_cmp_u16(r, fw->ethproto, op);
        }
 
        return _add_action(r, cs);