Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a902e6d authored by Jozsef Kadlecsik's avatar Jozsef Kadlecsik
Browse files

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: default avatarJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
parent cee8b97b

net/netfilter/ipset/ip_set_hash_gen.h

+8 −2
Original line number Diff line number Diff line
@@ -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