path: root/kernel
diff options
authorJozsef Kadlecsik <>2011-04-08 16:04:22 +0200
committerJozsef Kadlecsik <>2011-04-08 16:04:22 +0200
commitc0fc3e499f4bacbb7a1976afe33af143d34b068e (patch)
tree86df395a0be148c0d81252a2763b622bb1741e98 /kernel
parent202ca992312b908e410bed9a480e715e3bca660b (diff)
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. Manpage is updated to reflect the change.
Diffstat (limited to 'kernel')
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/net/netfilter/ipset/ip_set_bitmap_ipmac.c b/kernel/net/netfilter/ipset/ip_set_bitmap_ipmac.c
index 35b4879..913a461 100644
--- a/kernel/net/netfilter/ipset/ip_set_bitmap_ipmac.c
+++ b/kernel/net/netfilter/ipset/ip_set_bitmap_ipmac.c
@@ -344,6 +344,10 @@ bitmap_ipmac_kadt(struct ip_set *set, const struct sk_buff *skb,
ipset_adtfn adtfn = set->variant->adt[adt];
struct ipmac data;
+ /* MAC can be src only */
+ if (!(flags & IPSET_DIM_TWO_SRC))
+ return 0;
+ = ntohl(ip4addr(skb, flags & IPSET_DIM_ONE_SRC));
if ( < map->first_ip || > map->last_ip)