Explorar o código

netfilter: ipset: bitmap:ip,mac type requires "src" for MAC

Enforce that the second "src/dst" parameter of the set match and SET target
must be "src", because we have access to the source MAC only in the packet.
The previous behaviour, that the type required the second parameter
but actually ignored the value was counter-intuitive and confusing.

Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Jozsef Kadlecsik %!s(int64=14) %!d(string=hai) anos
pai
achega
0e8a835aa5
Modificáronse 1 ficheiros con 4 adicións e 0 borrados
  1. 4 0
      net/netfilter/ipset/ip_set_bitmap_ipmac.c

+ 4 - 0
net/netfilter/ipset/ip_set_bitmap_ipmac.c

@@ -343,6 +343,10 @@ bitmap_ipmac_kadt(struct ip_set *set, const struct sk_buff *skb,
 	ipset_adtfn adtfn = set->variant->adt[adt];
 	ipset_adtfn adtfn = set->variant->adt[adt];
 	struct ipmac data;
 	struct ipmac data;
 
 
+	/* MAC can be src only */
+	if (!(flags & IPSET_DIM_TWO_SRC))
+		return 0;
+
 	data.id = ntohl(ip4addr(skb, flags & IPSET_DIM_ONE_SRC));
 	data.id = ntohl(ip4addr(skb, flags & IPSET_DIM_ONE_SRC));
 	if (data.id < map->first_ip || data.id > map->last_ip)
 	if (data.id < map->first_ip || data.id > map->last_ip)
 		return -IPSET_ERR_BITMAP_RANGE;
 		return -IPSET_ERR_BITMAP_RANGE;