diff options
| author |   Pablo Neira Ayuso <pablo@netfilter.org> | 2020-08-20 14:12:54 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2020-08-21 19:00:14 +0200 |
| commit | 6f03bf43ee05b31d3822def2a80f11b3591c55b3 (patch) | |
| tree | c241a011e256f28d022f960143a9f3a348840a48 | |
| parent | netfilter: nft_set_rbtree: Detect partial overlap with start endpoint match (diff) | |
| download | wireguard-linux-6f03bf43ee05b31d3822def2a80f11b3591c55b3.tar.xz wireguard-linux-6f03bf43ee05b31d3822def2a80f11b3591c55b3.zip | |
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: e6d8ecac9e68 ("netfilter: nf_tables: Add new attributes into nft_set to store user data.")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | net/netfilter/nf_tables_api.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index fd814e514f94..71e501c5ad21 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -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); |