netfilter: flowtable: populate addr_type mask

commit 15ff197237e76c4dab06b7b518afaa4ebb1c43e0 upstream.

nf_flow_rule_match() sets control.addr_type in key, so needs to also set
 the corresponding mask.  An exact match is wanted, so mask is all ones.

Fixes: c29f74e0df7a ("netfilter: nf_flow_table: hardware offload support")
Signed-off-by: Edward Cree <ecree@solarflare.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/net/netfilter/nf_flow_table_offload.c b/net/netfilter/nf_flow_table_offload.c
index b879e673953f9534a83fcf6c38da8b58c0d0bac8..18ec95b3c46fee805def88fe019851819ba68f20 100644 (file)
--- a/net/netfilter/nf_flow_table_offload.c
+++ b/net/netfilter/nf_flow_table_offload.c
@@ -87,6 +87,7 @@ static int nf_flow_rule_match(struct nf_flow_match *match,
        default:
                return -EOPNOTSUPP;
        }
+       mask->control.addr_type = 0xffff;
        match->dissector.used_keys |= BIT(key->control.addr_type);
        mask->basic.n_proto = 0xffff;