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

Commit aef96193 authored by Jozsef Kadlecsik's avatar Jozsef Kadlecsik
Browse files

netfilter: ipset: send nonzero skbinfo extensions only 



Do not send zero valued skbinfo extensions to userspace at listing.

Signed-off-by: default avatarJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
parent 76cea410

include/linux/netfilter/ipset/ip_set.h

+11 −7
Original line number Diff line number Diff line
@@ -335,13 +335,17 @@ ip_set_get_skbinfo(struct ip_set_skbinfo *skbinfo, 
static inline bool

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 */

	return ((skbinfo->skbmark || skbinfo->skbmarkmask) &&

		nla_put_net64(skb, IPSET_ATTR_SKBMARK,

			      cpu_to_be64((u64)skbinfo->skbmark << 32 |

					 skbinfo->skbmarkmask)) ||

					  skbinfo->skbmarkmask))) ||

	       (skbinfo->skbprio &&

	        nla_put_net32(skb, IPSET_ATTR_SKBPRIO,

			     cpu_to_be32(skbinfo->skbprio)) ||

			      cpu_to_be32(skbinfo->skbprio))) ||

	       (skbinfo->skbqueue &&

	        nla_put_net16(skb, IPSET_ATTR_SKBQUEUE,

			     cpu_to_be16(skbinfo->skbqueue));

			     cpu_to_be16(skbinfo->skbqueue)));



}