diff options
| author |   Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2015-06-26 11:16:28 +0200 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2016-11-10 13:28:47 +0100 |
| commit | 5a902e6d4b61de33f4a9d3fc5fbc9d339fee7ed3 (patch) | |
| tree | 33f1f0703f9bacfdd2011ac1115c24408d841e15 /net | |
| parent | netfilter: ipset: Make NLEN compile time constant for hash types (diff) | |
| download | linux-dev-5a902e6d4b61de33f4a9d3fc5fbc9d339fee7ed3.tar.xz linux-dev-5a902e6d4b61de33f4a9d3fc5fbc9d339fee7ed3.zip | |
netfilter: ipset: Make sure element data size is a multiple of u32
Data for hashing required to be array of u32. Make sure that
element data always multiple of u32.
Ported from a patch proposed by Sergey Popovich <popovich_sergei@mail.ua>.
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/ipset/ip_set_hash_gen.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/net/netfilter/ipset/ip_set_hash_gen.h b/net/netfilter/ipset/ip_set_hash_gen.h index 6c88c20ae1d4..34f115f874ab 100644 --- a/net/netfilter/ipset/ip_set_hash_gen.h +++ b/net/netfilter/ipset/ip_set_hash_gen.h @@ -260,8 +260,14 @@ htable_bits(u32 hashsize) #endif #define HKEY(data, initval, htable_bits) \ -(jhash2((u32 *)(data), HKEY_DATALEN / sizeof(u32), initval) \ - & jhash_mask(htable_bits)) +({ \ + const u32 *__k = (const u32 *)data; \ + u32 __l = HKEY_DATALEN / sizeof(u32); \ + \ + BUILD_BUG_ON(HKEY_DATALEN % sizeof(u32) != 0); \ + \ + jhash2(__k, __l, initval) & jhash_mask(htable_bits); \ +}) #ifndef htype #ifndef HTYPE |