From ab144ee50d7b2ee1ba90af8a3bd0c438527095c3 Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Thu, 9 Oct 2014 10:58:30 +0200 Subject: Explicitly add padding elements to hash:net,net and hash:net,port,net The elements must be u32 sized for the used hash function. --- kernel/net/netfilter/ipset/ip_set_hash_netnet.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'kernel/net/netfilter/ipset/ip_set_hash_netnet.c') diff --git a/kernel/net/netfilter/ipset/ip_set_hash_netnet.c b/kernel/net/netfilter/ipset/ip_set_hash_netnet.c index da00284..ea8772a 100644 --- a/kernel/net/netfilter/ipset/ip_set_hash_netnet.c +++ b/kernel/net/netfilter/ipset/ip_set_hash_netnet.c @@ -46,6 +46,7 @@ struct hash_netnet4_elem { __be64 ipcmp; }; u8 nomatch; + u8 padding; union { u8 cidr[2]; u16 ccmp; @@ -271,6 +272,7 @@ hash_netnet4_uadt(struct ip_set *set, struct nlattr *tb[], struct hash_netnet6_elem { union nf_inet_addr ip[2]; u8 nomatch; + u8 padding; union { u8 cidr[2]; u16 ccmp; -- cgit v1.2.3