Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next

Pablo Neira Ayuso says:

====================
Netfilter updates for net-next

The following patchset contains Netfilter updates for net-next,
they are:

1) Don't use userspace datatypes in bridge netfilter code, from
   Tobin Harding.

2) Iterate only once over the expectation table when removing the
   helper module, instead of once per-netns, from Florian Westphal.

3) Extra sanitization in xt_hook_ops_alloc() to return error in case
   we ever pass zero hooks, xt_hook_ops_alloc():

4) Handle NFPROTO_INET from the logging core infrastructure, from
   Liping Zhang.

5) Autoload loggers when TRACE target is used from rules, this doesn't
   change the behaviour in case the user already selected nfnetlink_log
   as preferred way to print tracing logs, also from Liping Zhang.

6) Conntrack slabs with SLAB_HWCACHE_ALIGN to allow rearranging fields
   by cache lines, increases the size of entries in 11% per entry.
   From Florian Westphal.

7) Skip zone comparison if CONFIG_NF_CONNTRACK_ZONES=n, from Florian.

8) Remove useless defensive check in nf_logger_find_get() from Shivani
   Bhardwaj.

9) Remove zone extension as place it in the conntrack object, this is
   always include in the hashing and we expect more intensive use of
   zones since containers are in place. Also from Florian Westphal.

10) Owner match now works from any namespace, from Eric Bierdeman.

11) Make sure we only reply with TCP reset to TCP traffic from
    nf_reject_ipv4, patch from Liping Zhang.

12) Introduce --nflog-size to indicate amount of network packet bytes
    that are copied to userspace via log message, from Vishwanath Pai.
    This obsoletes --nflog-range that has never worked, it was designed
    to achieve this but it has never worked.

13) Introduce generic macros for nf_tables object generation masks.

14) Use generation mask in table, chain and set objects in nf_tables.
    This allows fixes interferences with ongoing preparation phase of
    the commit protocol and object listings going on at the same time.
    This update is introduced in three patches, one per object.

15) Check if the object is active in the next generation for element
    deactivation in the rbtree implementation, given that deactivation
    happens from the commit phase path we have to observe the future
    status of the object.

16) Support for deletion of just added elements in the hash set type.

17) Allow to resize hashtable from /proc entry, not only from the
    obscure /sys entry that maps to the module parameter, from Florian
    Westphal.

18) Get rid of NFT_BASECHAIN_DISABLED, this code is not exercised
    anymore since we tear down the ruleset whenever the netdevice
    goes away.

19) Support for matching inverted set lookups, from Arturo Borrero.

20) Simplify the iptables_mangle_hook() by removing a superfluous
    extra branch.

21) Introduce ether_addr_equal_masked() and use it from the netfilter
    codebase, from Joe Perches.

22) Remove references to "Use netfilter MARK value as routing key"
    from the Netfilter Kconfig description given that this toggle
    doesn't exists already for 10 years, from Moritz Sichert.

23) Introduce generic NF_INVF() and use it from the xtables codebase,
    from Joe Perches.

24) Setting logger to NONE via /proc was not working unless explicit
    nul-termination was included in the string. This fixes seems to
    leave the former behaviour there, so we don't break backward.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

6 files changed, 121 insertions, 126 deletions

diff --git a/net/bridge/netfilter/ebt_802_3.c b/net/bridge/netfilter/ebt_802_3.c
index 2a449b7ab8fa..5fc4affd9fdb 100644
--- a/net/bridge/netfilter/ebt_802_3.c
+++ b/net/bridge/netfilter/ebt_802_3.c
@@ -20,16 +20,16 @@ ebt_802_3_mt(const struct sk_buff *skb, struct xt_action_param *par)
         __be16 type = hdr->llc.ui.ctrl & IS_UI ? hdr->llc.ui.type : hdr->llc.ni.type;
 
         if (info->bitmask & EBT_802_3_SAP) {
-                if (FWINV(info->sap != hdr->llc.ui.ssap, EBT_802_3_SAP))
+                if (NF_INVF(info, EBT_802_3_SAP, info->sap != hdr->llc.ui.ssap))
                         return false;
-                if (FWINV(info->sap != hdr->llc.ui.dsap, EBT_802_3_SAP))
+                if (NF_INVF(info, EBT_802_3_SAP, info->sap != hdr->llc.ui.dsap))
                         return false;
         }
 
         if (info->bitmask & EBT_802_3_TYPE) {
                 if (!(hdr->llc.ui.dsap == CHECK_TYPE && hdr->llc.ui.ssap == CHECK_TYPE))
                         return false;
-                if (FWINV(info->type != type, EBT_802_3_TYPE))
+                if (NF_INVF(info, EBT_802_3_TYPE, info->type != type))
                         return false;
         }
 
diff --git a/net/bridge/netfilter/ebt_arp.c b/net/bridge/netfilter/ebt_arp.c
index cd457b891b27..227142282b45 100644
--- a/net/bridge/netfilter/ebt_arp.c
+++ b/net/bridge/netfilter/ebt_arp.c
@@ -25,14 +25,14 @@ ebt_arp_mt(const struct sk_buff *skb, struct xt_action_param *par)
         ah = skb_header_pointer(skb, 0, sizeof(_arph), &_arph);
         if (ah == NULL)
                 return false;
-        if (info->bitmask & EBT_ARP_OPCODE && FWINV(info->opcode !=
-           ah->ar_op, EBT_ARP_OPCODE))
+        if ((info->bitmask & EBT_ARP_OPCODE) &&
+            NF_INVF(info, EBT_ARP_OPCODE, info->opcode != ah->ar_op))
                 return false;
-        if (info->bitmask & EBT_ARP_HTYPE && FWINV(info->htype !=
-           ah->ar_hrd, EBT_ARP_HTYPE))
+        if ((info->bitmask & EBT_ARP_HTYPE) &&
+            NF_INVF(info, EBT_ARP_HTYPE, info->htype != ah->ar_hrd))
                 return false;
-        if (info->bitmask & EBT_ARP_PTYPE && FWINV(info->ptype !=
-           ah->ar_pro, EBT_ARP_PTYPE))
+        if ((info->bitmask & EBT_ARP_PTYPE) &&
+            NF_INVF(info, EBT_ARP_PTYPE, info->ptype != ah->ar_pro))
                 return false;
 
         if (info->bitmask & (EBT_ARP_SRC_IP | EBT_ARP_DST_IP | EBT_ARP_GRAT)) {
@@ -51,21 +51,22 @@ ebt_arp_mt(const struct sk_buff *skb, struct xt_action_param *par)
                                         sizeof(daddr), &daddr);
                 if (dap == NULL)
                         return false;
-                if (info->bitmask & EBT_ARP_SRC_IP &&
-                    FWINV(info->saddr != (*sap & info->smsk), EBT_ARP_SRC_IP))
+                if ((info->bitmask & EBT_ARP_SRC_IP) &&
+                    NF_INVF(info, EBT_ARP_SRC_IP,
+                            info->saddr != (*sap & info->smsk)))
                         return false;
-                if (info->bitmask & EBT_ARP_DST_IP &&
-                    FWINV(info->daddr != (*dap & info->dmsk), EBT_ARP_DST_IP))
+                if ((info->bitmask & EBT_ARP_DST_IP) &&
+                    NF_INVF(info, EBT_ARP_DST_IP,
+                            info->daddr != (*dap & info->dmsk)))
                         return false;
-                if (info->bitmask & EBT_ARP_GRAT &&
-                    FWINV(*dap != *sap, EBT_ARP_GRAT))
+                if ((info->bitmask & EBT_ARP_GRAT) &&
+                    NF_INVF(info, EBT_ARP_GRAT, *dap != *sap))
                         return false;
         }
 
         if (info->bitmask & (EBT_ARP_SRC_MAC | EBT_ARP_DST_MAC)) {
                 const unsigned char *mp;
                 unsigned char _mac[ETH_ALEN];
-                uint8_t verdict, i;
 
                 if (ah->ar_hln != ETH_ALEN || ah->ar_hrd != htons(ARPHRD_ETHER))
                         return false;
@@ -74,11 +75,9 @@ ebt_arp_mt(const struct sk_buff *skb, struct xt_action_param *par)
                                                 sizeof(_mac), &_mac);
                         if (mp == NULL)
                                 return false;
-                        verdict = 0;
-                        for (i = 0; i < 6; i++)
-                                verdict |= (mp[i] ^ info->smaddr[i]) &
-                                       info->smmsk[i];
-                        if (FWINV(verdict != 0, EBT_ARP_SRC_MAC))
+                        if (NF_INVF(info, EBT_ARP_SRC_MAC,
+                                    !ether_addr_equal_masked(mp, info->smaddr,
+                                                             info->smmsk)))
                                 return false;
                 }
 
@@ -88,11 +87,9 @@ ebt_arp_mt(const struct sk_buff *skb, struct xt_action_param *par)
                                                 sizeof(_mac), &_mac);
                         if (mp == NULL)
                                 return false;
-                        verdict = 0;
-                        for (i = 0; i < 6; i++)
-                                verdict |= (mp[i] ^ info->dmaddr[i]) &
-                                        info->dmmsk[i];
-                        if (FWINV(verdict != 0, EBT_ARP_DST_MAC))
+                        if (NF_INVF(info, EBT_ARP_DST_MAC,
+                                    !ether_addr_equal_masked(mp, info->dmaddr,
+                                                             info->dmmsk)))
                                 return false;
                 }
         }
diff --git a/net/bridge/netfilter/ebt_ip.c b/net/bridge/netfilter/ebt_ip.c
index 23bca62d58d2..d06968bdf5ec 100644
--- a/net/bridge/netfilter/ebt_ip.c
+++ b/net/bridge/netfilter/ebt_ip.c
@@ -36,19 +36,19 @@ ebt_ip_mt(const struct sk_buff *skb, struct xt_action_param *par)
         ih = skb_header_pointer(skb, 0, sizeof(_iph), &_iph);
         if (ih == NULL)
                 return false;
-        if (info->bitmask & EBT_IP_TOS &&
-           FWINV(info->tos != ih->tos, EBT_IP_TOS))
+        if ((info->bitmask & EBT_IP_TOS) &&
+            NF_INVF(info, EBT_IP_TOS, info->tos != ih->tos))
                 return false;
-        if (info->bitmask & EBT_IP_SOURCE &&
-           FWINV((ih->saddr & info->smsk) !=
-           info->saddr, EBT_IP_SOURCE))
+        if ((info->bitmask & EBT_IP_SOURCE) &&
+            NF_INVF(info, EBT_IP_SOURCE,
+                    (ih->saddr & info->smsk) != info->saddr))
                 return false;
         if ((info->bitmask & EBT_IP_DEST) &&
-           FWINV((ih->daddr & info->dmsk) !=
-           info->daddr, EBT_IP_DEST))
+            NF_INVF(info, EBT_IP_DEST,
+                    (ih->daddr & info->dmsk) != info->daddr))
                 return false;
         if (info->bitmask & EBT_IP_PROTO) {
-                if (FWINV(info->protocol != ih->protocol, EBT_IP_PROTO))
+                if (NF_INVF(info, EBT_IP_PROTO, info->protocol != ih->protocol))
                         return false;
                 if (!(info->bitmask & EBT_IP_DPORT) &&
                     !(info->bitmask & EBT_IP_SPORT))
@@ -61,16 +61,16 @@ ebt_ip_mt(const struct sk_buff *skb, struct xt_action_param *par)
                         return false;
                 if (info->bitmask & EBT_IP_DPORT) {
                         u32 dst = ntohs(pptr->dst);
-                        if (FWINV(dst < info->dport[0] ||
-                                  dst > info->dport[1],
-                                  EBT_IP_DPORT))
+                        if (NF_INVF(info, EBT_IP_DPORT,
+                                    dst < info->dport[0] ||
+                                    dst > info->dport[1]))
                         return false;
                 }
                 if (info->bitmask & EBT_IP_SPORT) {
                         u32 src = ntohs(pptr->src);
-                        if (FWINV(src < info->sport[0] ||
-                                  src > info->sport[1],
-                                  EBT_IP_SPORT))
+                        if (NF_INVF(info, EBT_IP_SPORT,
+                                    src < info->sport[0] ||
+                                    src > info->sport[1]))
                         return false;
                 }
         }
diff --git a/net/bridge/netfilter/ebt_ip6.c b/net/bridge/netfilter/ebt_ip6.c
index 98de6e7fd86d..4617491be41e 100644
--- a/net/bridge/netfilter/ebt_ip6.c
+++ b/net/bridge/netfilter/ebt_ip6.c
@@ -45,15 +45,18 @@ ebt_ip6_mt(const struct sk_buff *skb, struct xt_action_param *par)
         ih6 = skb_header_pointer(skb, 0, sizeof(_ip6h), &_ip6h);
         if (ih6 == NULL)
                 return false;
-        if (info->bitmask & EBT_IP6_TCLASS &&
-           FWINV(info->tclass != ipv6_get_dsfield(ih6), EBT_IP6_TCLASS))
+        if ((info->bitmask & EBT_IP6_TCLASS) &&
+            NF_INVF(info, EBT_IP6_TCLASS,
+                    info->tclass != ipv6_get_dsfield(ih6)))
                 return false;
-        if ((info->bitmask & EBT_IP6_SOURCE &&
-            FWINV(ipv6_masked_addr_cmp(&ih6->saddr, &info->smsk,
-                                       &info->saddr), EBT_IP6_SOURCE)) ||
-            (info->bitmask & EBT_IP6_DEST &&
-            FWINV(ipv6_masked_addr_cmp(&ih6->daddr, &info->dmsk,
-                                       &info->daddr), EBT_IP6_DEST)))
+        if (((info->bitmask & EBT_IP6_SOURCE) &&
+             NF_INVF(info, EBT_IP6_SOURCE,
+                     ipv6_masked_addr_cmp(&ih6->saddr, &info->smsk,
+                                          &info->saddr))) ||
+            ((info->bitmask & EBT_IP6_DEST) &&
+             NF_INVF(info, EBT_IP6_DEST,
+                     ipv6_masked_addr_cmp(&ih6->daddr, &info->dmsk,
+                                          &info->daddr))))
                 return false;
         if (info->bitmask & EBT_IP6_PROTO) {
                 uint8_t nexthdr = ih6->nexthdr;
@@ -63,7 +66,7 @@ ebt_ip6_mt(const struct sk_buff *skb, struct xt_action_param *par)
                 offset_ph = ipv6_skip_exthdr(skb, sizeof(_ip6h), &nexthdr, &frag_off);
                 if (offset_ph == -1)
                         return false;
-                if (FWINV(info->protocol != nexthdr, EBT_IP6_PROTO))
+                if (NF_INVF(info, EBT_IP6_PROTO, info->protocol != nexthdr))
                         return false;
                 if (!(info->bitmask & (EBT_IP6_DPORT |
                                        EBT_IP6_SPORT | EBT_IP6_ICMP6)))
@@ -76,22 +79,24 @@ ebt_ip6_mt(const struct sk_buff *skb, struct xt_action_param *par)
                         return false;
                 if (info->bitmask & EBT_IP6_DPORT) {
                         u16 dst = ntohs(pptr->tcpudphdr.dst);
-                        if (FWINV(dst < info->dport[0] ||
-                                  dst > info->dport[1], EBT_IP6_DPORT))
+                        if (NF_INVF(info, EBT_IP6_DPORT,
+                                    dst < info->dport[0] ||
+                                    dst > info->dport[1]))
                                 return false;
                 }
                 if (info->bitmask & EBT_IP6_SPORT) {
                         u16 src = ntohs(pptr->tcpudphdr.src);
-                        if (FWINV(src < info->sport[0] ||
-                                  src > info->sport[1], EBT_IP6_SPORT))
+                        if (NF_INVF(info, EBT_IP6_SPORT,
+                                    src < info->sport[0] ||
+                                    src > info->sport[1]))
                         return false;
                 }
                 if ((info->bitmask & EBT_IP6_ICMP6) &&
-                     FWINV(pptr->icmphdr.type < info->icmpv6_type[0] ||
-                           pptr->icmphdr.type > info->icmpv6_type[1] ||
-                           pptr->icmphdr.code < info->icmpv6_code[0] ||
-                           pptr->icmphdr.code > info->icmpv6_code[1],
-                                                        EBT_IP6_ICMP6))
+                    NF_INVF(info, EBT_IP6_ICMP6,
+                            pptr->icmphdr.type < info->icmpv6_type[0] ||
+                            pptr->icmphdr.type > info->icmpv6_type[1] ||
+                            pptr->icmphdr.code < info->icmpv6_code[0] ||
+                            pptr->icmphdr.code > info->icmpv6_code[1]))
                         return false;
         }
         return true;
diff --git a/net/bridge/netfilter/ebt_stp.c b/net/bridge/netfilter/ebt_stp.c
index 6b731e12ecfa..3140eb912d7e 100644
--- a/net/bridge/netfilter/ebt_stp.c
+++ b/net/bridge/netfilter/ebt_stp.c
@@ -17,24 +17,24 @@
 #define BPDU_TYPE_TCN 0x80
 
 struct stp_header {
-        uint8_t dsap;
-        uint8_t ssap;
-        uint8_t ctrl;
-        uint8_t pid;
-        uint8_t vers;
-        uint8_t type;
+        u8 dsap;
+        u8 ssap;
+        u8 ctrl;
+        u8 pid;
+        u8 vers;
+        u8 type;
 };
 
 struct stp_config_pdu {
-        uint8_t flags;
-        uint8_t root[8];
-        uint8_t root_cost[4];
-        uint8_t sender[8];
-        uint8_t port[2];
-        uint8_t msg_age[2];
-        uint8_t max_age[2];
-        uint8_t hello_time[2];
-        uint8_t forward_delay[2];
+        u8 flags;
+        u8 root[8];
+        u8 root_cost[4];
+        u8 sender[8];
+        u8 port[2];
+        u8 msg_age[2];
+        u8 max_age[2];
+        u8 hello_time[2];
+        u8 forward_delay[2];
 };
 
 #define NR16(p) (p[0] << 8 | p[1])
@@ -44,76 +44,73 @@ static bool ebt_filter_config(const struct ebt_stp_info *info,
                               const struct stp_config_pdu *stpc)
 {
         const struct ebt_stp_config_info *c;
-        uint16_t v16;
-        uint32_t v32;
-        int verdict, i;
+        u16 v16;
+        u32 v32;
 
         c = &info->config;
         if ((info->bitmask & EBT_STP_FLAGS) &&
-            FWINV(c->flags != stpc->flags, EBT_STP_FLAGS))
+            NF_INVF(info, EBT_STP_FLAGS, c->flags != stpc->flags))
                 return false;
         if (info->bitmask & EBT_STP_ROOTPRIO) {
                 v16 = NR16(stpc->root);
-                if (FWINV(v16 < c->root_priol ||
-                    v16 > c->root_priou, EBT_STP_ROOTPRIO))
+                if (NF_INVF(info, EBT_STP_ROOTPRIO,
+                            v16 < c->root_priol || v16 > c->root_priou))
                         return false;
         }
         if (info->bitmask & EBT_STP_ROOTADDR) {
-                verdict = 0;
-                for (i = 0; i < 6; i++)
-                        verdict |= (stpc->root[2+i] ^ c->root_addr[i]) &
-                                   c->root_addrmsk[i];
-                if (FWINV(verdict != 0, EBT_STP_ROOTADDR))
+                if (NF_INVF(info, EBT_STP_ROOTADDR,
+                            !ether_addr_equal_masked(&stpc->root[2],
+                                                     c->root_addr,
+                                                     c->root_addrmsk)))
                         return false;
         }
         if (info->bitmask & EBT_STP_ROOTCOST) {
                 v32 = NR32(stpc->root_cost);
-                if (FWINV(v32 < c->root_costl ||
-                    v32 > c->root_costu, EBT_STP_ROOTCOST))
+                if (NF_INVF(info, EBT_STP_ROOTCOST,
+                            v32 < c->root_costl || v32 > c->root_costu))
                         return false;
         }
         if (info->bitmask & EBT_STP_SENDERPRIO) {
                 v16 = NR16(stpc->sender);
-                if (FWINV(v16 < c->sender_priol ||
-                    v16 > c->sender_priou, EBT_STP_SENDERPRIO))
+                if (NF_INVF(info, EBT_STP_SENDERPRIO,
+                            v16 < c->sender_priol || v16 > c->sender_priou))
                         return false;
         }
         if (info->bitmask & EBT_STP_SENDERADDR) {
-                verdict = 0;
-                for (i = 0; i < 6; i++)
-                        verdict |= (stpc->sender[2+i] ^ c->sender_addr[i]) &
-                                   c->sender_addrmsk[i];
-                if (FWINV(verdict != 0, EBT_STP_SENDERADDR))
+                if (NF_INVF(info, EBT_STP_SENDERADDR,
+                            !ether_addr_equal_masked(&stpc->sender[2],
+                                                     c->sender_addr,
+                                                     c->sender_addrmsk)))
                         return false;
         }
         if (info->bitmask & EBT_STP_PORT) {
                 v16 = NR16(stpc->port);
-                if (FWINV(v16 < c->portl ||
-                    v16 > c->portu, EBT_STP_PORT))
+                if (NF_INVF(info, EBT_STP_PORT,
+                            v16 < c->portl || v16 > c->portu))
                         return false;
         }
         if (info->bitmask & EBT_STP_MSGAGE) {
                 v16 = NR16(stpc->msg_age);
-                if (FWINV(v16 < c->msg_agel ||
-                    v16 > c->msg_ageu, EBT_STP_MSGAGE))
+                if (NF_INVF(info, EBT_STP_MSGAGE,
+                            v16 < c->msg_agel || v16 > c->msg_ageu))
                         return false;
         }
         if (info->bitmask & EBT_STP_MAXAGE) {
                 v16 = NR16(stpc->max_age);
-                if (FWINV(v16 < c->max_agel ||
-                    v16 > c->max_ageu, EBT_STP_MAXAGE))
+                if (NF_INVF(info, EBT_STP_MAXAGE,
+                            v16 < c->max_agel || v16 > c->max_ageu))
                         return false;
         }
         if (info->bitmask & EBT_STP_HELLOTIME) {
                 v16 = NR16(stpc->hello_time);
-                if (FWINV(v16 < c->hello_timel ||
-                    v16 > c->hello_timeu, EBT_STP_HELLOTIME))
+                if (NF_INVF(info, EBT_STP_HELLOTIME,
+                            v16 < c->hello_timel || v16 > c->hello_timeu))
                         return false;
         }
         if (info->bitmask & EBT_STP_FWDD) {
                 v16 = NR16(stpc->forward_delay);
-                if (FWINV(v16 < c->forward_delayl ||
-                    v16 > c->forward_delayu, EBT_STP_FWDD))
+                if (NF_INVF(info, EBT_STP_FWDD,
+                            v16 < c->forward_delayl || v16 > c->forward_delayu))
                         return false;
         }
         return true;
@@ -125,7 +122,7 @@ ebt_stp_mt(const struct sk_buff *skb, struct xt_action_param *par)
         const struct ebt_stp_info *info = par->matchinfo;
         const struct stp_header *sp;
         struct stp_header _stph;
-        const uint8_t header[6] = {0x42, 0x42, 0x03, 0x00, 0x00, 0x00};
+        const u8 header[6] = {0x42, 0x42, 0x03, 0x00, 0x00, 0x00};
 
         sp = skb_header_pointer(skb, 0, sizeof(_stph), &_stph);
         if (sp == NULL)
@@ -135,8 +132,8 @@ ebt_stp_mt(const struct sk_buff *skb, struct xt_action_param *par)
         if (memcmp(sp, header, sizeof(header)))
                 return false;
 
-        if (info->bitmask & EBT_STP_TYPE &&
-            FWINV(info->type != sp->type, EBT_STP_TYPE))
+        if ((info->bitmask & EBT_STP_TYPE) &&
+            NF_INVF(info, EBT_STP_TYPE, info->type != sp->type))
                 return false;
 
         if (sp->type == BPDU_TYPE_CONFIG &&
@@ -156,8 +153,8 @@ ebt_stp_mt(const struct sk_buff *skb, struct xt_action_param *par)
 static int ebt_stp_mt_check(const struct xt_mtchk_param *par)
 {
         const struct ebt_stp_info *info = par->matchinfo;
-        const uint8_t bridge_ula[6] = {0x01, 0x80, 0xc2, 0x00, 0x00, 0x00};
-        const uint8_t msk[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+        const u8 bridge_ula[6] = {0x01, 0x80, 0xc2, 0x00, 0x00, 0x00};
+        const u8 msk[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
         const struct ebt_entry *e = par->entryinfo;
 
         if (info->bitmask & ~EBT_STP_MASK || info->invflags & ~EBT_STP_MASK ||
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index 5a61f35412a0..cceac5bb658f 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -121,7 +121,6 @@ ebt_dev_check(const char *entry, const struct net_device *device)
         return devname[i] != entry[i] && entry[i] != 1;
 }
 
-#define FWINV2(bool, invflg) ((bool) ^ !!(e->invflags & invflg))
 /* process standard matches */
 static inline int
 ebt_basic_match(const struct ebt_entry *e, const struct sk_buff *skb,
@@ -130,7 +129,6 @@ ebt_basic_match(const struct ebt_entry *e, const struct sk_buff *skb,
         const struct ethhdr *h = eth_hdr(skb);
         const struct net_bridge_port *p;
         __be16 ethproto;
-        int verdict, i;
 
         if (skb_vlan_tag_present(skb))
                 ethproto = htons(ETH_P_8021Q);
@@ -138,38 +136,36 @@ ebt_basic_match(const struct ebt_entry *e, const struct sk_buff *skb,
                 ethproto = h->h_proto;
 
         if (e->bitmask & EBT_802_3) {
-                if (FWINV2(eth_proto_is_802_3(ethproto), EBT_IPROTO))
+                if (NF_INVF(e, EBT_IPROTO, eth_proto_is_802_3(ethproto)))
                         return 1;
         } else if (!(e->bitmask & EBT_NOPROTO) &&
-           FWINV2(e->ethproto != ethproto, EBT_IPROTO))
+                   NF_INVF(e, EBT_IPROTO, e->ethproto != ethproto))
                 return 1;
 
-        if (FWINV2(ebt_dev_check(e->in, in), EBT_IIN))
+        if (NF_INVF(e, EBT_IIN, ebt_dev_check(e->in, in)))
                 return 1;
-        if (FWINV2(ebt_dev_check(e->out, out), EBT_IOUT))
+        if (NF_INVF(e, EBT_IOUT, ebt_dev_check(e->out, out)))
                 return 1;
         /* rcu_read_lock()ed by nf_hook_slow */
         if (in && (p = br_port_get_rcu(in)) != NULL &&
-            FWINV2(ebt_dev_check(e->logical_in, p->br->dev), EBT_ILOGICALIN))
+            NF_INVF(e, EBT_ILOGICALIN,
+                    ebt_dev_check(e->logical_in, p->br->dev)))
                 return 1;
         if (out && (p = br_port_get_rcu(out)) != NULL &&
-            FWINV2(ebt_dev_check(e->logical_out, p->br->dev), EBT_ILOGICALOUT))
+            NF_INVF(e, EBT_ILOGICALOUT,
+                    ebt_dev_check(e->logical_out, p->br->dev)))
                 return 1;
 
         if (e->bitmask & EBT_SOURCEMAC) {
-                verdict = 0;
-                for (i = 0; i < 6; i++)
-                        verdict |= (h->h_source[i] ^ e->sourcemac[i]) &
-                           e->sourcemsk[i];
-                if (FWINV2(verdict != 0, EBT_ISOURCE))
+                if (NF_INVF(e, EBT_ISOURCE,
+                            !ether_addr_equal_masked(h->h_source, e->sourcemac,
+                                                     e->sourcemsk)))
                         return 1;
         }
         if (e->bitmask & EBT_DESTMAC) {
-                verdict = 0;
-                for (i = 0; i < 6; i++)
-                        verdict |= (h->h_dest[i] ^ e->destmac[i]) &
-                           e->destmsk[i];
-                if (FWINV2(verdict != 0, EBT_IDEST))
+                if (NF_INVF(e, EBT_IDEST,
+                            !ether_addr_equal_masked(h->h_dest, e->destmac,
+                                                     e->destmsk)))
                         return 1;
         }
         return 0;