netfilter: ipset: Explicitly add padding elements to hash:net, net and hash:net, port, net

The elements must be u32 sized for the used hash function.

Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

2 files changed, 4 insertions, 0 deletions

diff --git a/net/netfilter/ipset/ip_set_hash_netnet.c b/net/netfilter/ipset/ip_set_hash_netnet.c
index da00284b3571..ea8772afb6e7 100644
--- a/net/netfilter/ipset/ip_set_hash_netnet.c
+++ b/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;
diff --git a/net/netfilter/ipset/ip_set_hash_netportnet.c b/net/netfilter/ipset/ip_set_hash_netportnet.c
index b8053d675fc3..bfaa94c7baa7 100644
--- a/net/netfilter/ipset/ip_set_hash_netportnet.c
+++ b/net/netfilter/ipset/ip_set_hash_netportnet.c
@@ -53,6 +53,7 @@ struct hash_netportnet4_elem {
                 u8 cidr[2];
                 u16 ccmp;
         };
+        u16 padding;
         u8 nomatch:1;
         u8 proto;
 };
@@ -324,6 +325,7 @@ struct hash_netportnet6_elem {
                 u8 cidr[2];
                 u16 ccmp;
         };
+        u16 padding;
         u8 nomatch:1;
         u8 proto;
 };