netfilter: flowtable: populate addr_type mask

ecree-solarflare · ummakynes · commit 15ff197237e7 · 2020-03-19T21:20:04.000+01:00
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: c29f74e ("netfilter: nf_flow_table: hardware offload support") Signed-off-by: Edward Cree <ecree@solarflare.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
diff --git 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;
 

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,7 @@ static int nf_flow_rule_match(struct nf_flow_match *match,`
`87`	`87`	`default:`
`88`	`88`	`return -EOPNOTSUPP;`
`89`	`89`	`}`
	`90`	`+ mask->control.addr_type = 0xffff;`
`90`	`91`	`match->dissector.used_keys \|= BIT(key->control.addr_type);`
`91`	`92`	`mask->basic.n_proto = 0xffff;`
`92`	`93`