netfilter: nft_set_rbtree: get command skips end element with open interval
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH 1/1 netfilter: nft_set_rbtree: get command skips end element with open interval
The get command on intervals provide partial matches such as subranges for usability reasons. However, an open interval has no closing end element. If the closing element matches within the range of the open internal, ie. its closest match is the start element of the open range, then, return 0 but offer no matching element to userspace through netlink as a special case. Userspace provides at least a matching start element in this case and the closing end element matching the open interal is ignored.
Another possibility is to report the matching start element of the open interval for this end interval. However, this results in duplicated matching being listed in userspace because userspace does not expect a start element as response to a end element.
--- net/netfilter/nf_tables_api.c | 3 +++ net/netfilter/nft_set_rbtree.c | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-)
net/netfilter/nf_tables_api.c +3 -0
@@ -6563,6 +6563,9 @@ static int nft_get_set_elem(struct nft_ctx *ctx, const struct nft_set *set,if (err <0 )return err; +if (!elem.priv) +return 0 ; + err = -ENOMEM ; skb =nlmsg_new (NLMSG_GOODSIZE ,GFP_ATOMIC );if (skb ==NULL )
net/netfilter/nft_set_rbtree.c +6 -2
@@ -184,10 +184,14 @@ nft_rbtree_get(const struct net *net, const struct nft_set *set,if (!interval ||nft_set_elem_expired (interval->from))return ERR_PTR (-ENOENT ); -if (flags &NFT_SET_ELEM_INTERVAL_END ) +if (flags &NFT_SET_ELEM_INTERVAL_END ) { +if (!interval->to) +return NULL ; + rbe = container_of(interval->to, struct nft_rbtree_elem, ext); -else + }else { rbe = container_of(interval->from, struct nft_rbtree_elem, ext); + }return &rbe->priv; }
Signature · 1 line
2.47.3