Commit 6f03bf43 authored Aug 20, 2020 by Pablo Neira Ayuso

netfilter: nf_tables: add NFTA_SET_USERDATA if not null

Kernel sends an empty NFTA_SET_USERDATA attribute with no value if
userspace adds a set with no NFTA_SET_USERDATA attribute.

Fixes: e6d8ecac ("netfilter: nf_tables: Add new attributes into nft_set to store user data.")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

parent 07267630

net/netfilter/nf_tables_api.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -3770,7 +3770,8 @@ static int nf_tables_fill_set(struct sk_buff skb, const struct nft_ctx ctx,
		goto nla_put_failure;
		}

		if (nla_put(skb, NFTA_SET_USERDATA, set->udlen, set->udata))
		if (set->udata &&
		nla_put(skb, NFTA_SET_USERDATA, set->udlen, set->udata))
		goto nla_put_failure;

		nest = nla_nest_start_noflag(skb, NFTA_SET_DESC);