提交 cac37639 编写于 作者: J Jozsef Kadlecsik 提交者: Pablo Neira Ayuso

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: NJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: NPablo Neira Ayuso <pablo@netfilter.org>
上级 77b4311d
...@@ -46,6 +46,7 @@ struct hash_netnet4_elem { ...@@ -46,6 +46,7 @@ struct hash_netnet4_elem {
__be64 ipcmp; __be64 ipcmp;
}; };
u8 nomatch; u8 nomatch;
u8 padding;
union { union {
u8 cidr[2]; u8 cidr[2];
u16 ccmp; u16 ccmp;
...@@ -271,6 +272,7 @@ hash_netnet4_uadt(struct ip_set *set, struct nlattr *tb[], ...@@ -271,6 +272,7 @@ hash_netnet4_uadt(struct ip_set *set, struct nlattr *tb[],
struct hash_netnet6_elem { struct hash_netnet6_elem {
union nf_inet_addr ip[2]; union nf_inet_addr ip[2];
u8 nomatch; u8 nomatch;
u8 padding;
union { union {
u8 cidr[2]; u8 cidr[2];
u16 ccmp; u16 ccmp;
......
...@@ -53,6 +53,7 @@ struct hash_netportnet4_elem { ...@@ -53,6 +53,7 @@ struct hash_netportnet4_elem {
u8 cidr[2]; u8 cidr[2];
u16 ccmp; u16 ccmp;
}; };
u16 padding;
u8 nomatch:1; u8 nomatch:1;
u8 proto; u8 proto;
}; };
...@@ -324,6 +325,7 @@ struct hash_netportnet6_elem { ...@@ -324,6 +325,7 @@ struct hash_netportnet6_elem {
u8 cidr[2]; u8 cidr[2];
u16 ccmp; u16 ccmp;
}; };
u16 padding;
u8 nomatch:1; u8 nomatch:1;
u8 proto; u8 proto;
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册