netfilter: ipset: send nonzero skbinfo extensions only
Do not send zero valued skbinfo extensions to userspace at listing. Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
This commit is contained in:
parent
76cea4109c
commit
aef96193fe
|
@ -335,13 +335,17 @@ ip_set_get_skbinfo(struct ip_set_skbinfo *skbinfo,
|
||||||
static inline bool
|
static inline bool
|
||||||
ip_set_put_skbinfo(struct sk_buff *skb, struct ip_set_skbinfo *skbinfo)
|
ip_set_put_skbinfo(struct sk_buff *skb, struct ip_set_skbinfo *skbinfo)
|
||||||
{
|
{
|
||||||
return nla_put_net64(skb, IPSET_ATTR_SKBMARK,
|
/* Send nonzero parameters only */
|
||||||
cpu_to_be64((u64)skbinfo->skbmark << 32 |
|
return ((skbinfo->skbmark || skbinfo->skbmarkmask) &&
|
||||||
skbinfo->skbmarkmask)) ||
|
nla_put_net64(skb, IPSET_ATTR_SKBMARK,
|
||||||
nla_put_net32(skb, IPSET_ATTR_SKBPRIO,
|
cpu_to_be64((u64)skbinfo->skbmark << 32 |
|
||||||
cpu_to_be32(skbinfo->skbprio)) ||
|
skbinfo->skbmarkmask))) ||
|
||||||
nla_put_net16(skb, IPSET_ATTR_SKBQUEUE,
|
(skbinfo->skbprio &&
|
||||||
cpu_to_be16(skbinfo->skbqueue));
|
nla_put_net32(skb, IPSET_ATTR_SKBPRIO,
|
||||||
|
cpu_to_be32(skbinfo->skbprio))) ||
|
||||||
|
(skbinfo->skbqueue &&
|
||||||
|
nla_put_net16(skb, IPSET_ATTR_SKBQUEUE,
|
||||||
|
cpu_to_be16(skbinfo->skbqueue)));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue