FAILED: patch "[PATCH] netfilter: nft_dynset: dump expressions when set definition" failed to apply to 5.10-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From ce5379963b2884e9d23bea0c5674a7251414c84b Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <[email protected]>
Date: Sat, 16 Jan 2021 19:50:34 +0100
Subject: [PATCH] netfilter: nft_dynset: dump expressions when set definition
contains no expressions
If the set definition provides no stateful expressions, then include the stateful expression in the ruleset listing. Without this fix, the dynset rule listing shows the stateful expressions provided by the set definition.
net/netfilter/nft_dynset.c +17 -14
@@ -384,22 +384,25 @@ static int nft_dynset_dump(struct sk_buff *skb, const struct nft_expr *expr) nf_jiffies64_to_msecs(priv->timeout), NFTA_DYNSET_PAD)) goto nla_put_failure; -if (priv->num_exprs ==1 ) { -if (nft_expr_dump (skb,NFTA_DYNSET_EXPR , priv->expr_array[0 ])) - goto nla_put_failure; - }else if (priv->num_exprs >1 ) { -struct nlattr *nest; - - nest =nla_nest_start_noflag (skb,NFTA_DYNSET_EXPRESSIONS ); -if (!nest) - goto nla_put_failure; - -for (i =0 ; i < priv->num_exprs; i++) { -if (nft_expr_dump (skb,NFTA_LIST_ELEM , - priv->expr_array[i])) +if (priv->set->num_exprs ==0 ) { +if (priv->num_exprs ==1 ) { +if (nft_expr_dump (skb,NFTA_DYNSET_EXPR , + priv->expr_array[0 ])) goto nla_put_failure; + }else if (priv->num_exprs >1 ) { +struct nlattr *nest; + + nest =nla_nest_start_noflag (skb,NFTA_DYNSET_EXPRESSIONS ); +if (!nest) + goto nla_put_failure; + +for (i =0 ; i < priv->num_exprs; i++) { +if (nft_expr_dump (skb,NFTA_LIST_ELEM , + priv->expr_array[i])) + goto nla_put_failure; + } +nla_nest_end (skb, nest); } -nla_nest_end (skb, nest); }if (nla_put_be32 (skb,NFTA_DYNSET_FLAGS ,htonl (flags))) goto nla_put_failure;