netfilter: nft_set_pipapo: split gc into unlink and reclaim phase

[ Upstream commit 9df95785d3d8302f7c066050117b04cd3c2048c2 ]

Yiming Qian reports Use-after-free in the pipapo set type:
  Under a large number of expired elements, commit-time GC can run for a very
  long time in a non-preemptible context, triggering soft lockup warnings and
  RCU stall reports (local denial of service).

We must split GC in an unlink and a reclaim phase.

We cannot queue elements for freeing until pointers have been swapped.
Expired elements are still exposed to both the packet path and userspace
dumpers via the live copy of the data structure.

call_rcu() does not protect us: dump operations or element lookups starting
after call_rcu has fired can still observe the free'd element, unless the
commit phase has made enough progress to swap the clone and live pointers
before any new reader has picked up the old version.

This a similar approach as done recently for the rbtree backend in commit
35f83a75529a ("netfilter: nft_set_rbtree: don't gc elements on insert").

Fixes: 3c4287f62044 ("nf_tables: Add set type for arbitrary concatenation of ranges")
Reported-by: Yiming Qian <yimingqian591@gmail.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h
index 077d3121cc9f1347c32b20177f71354c31d2059b..c18cffafc96964dc9777844b99def180c344a0ea 100644 (file)
--- a/include/net/netfilter/nf_tables.h
+++ b/include/net/netfilter/nf_tables.h
@@ -1860,6 +1860,11 @@ struct nft_trans_gc {
        struct rcu_head         rcu;
 };
 
+static inline int nft_trans_gc_space(const struct nft_trans_gc *trans)
+{
+       return NFT_TRANS_GC_BATCHCOUNT - trans->count;
+}
+
 static inline void nft_ctx_update(struct nft_ctx *ctx,
                                  const struct nft_trans *trans)
 {

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 7b357a2a871ed1fc4f294f61c9f6049d136eb243..a3865924a505dce472e410dfc1fc16b4e4b03bb0 100644 (file)
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -10480,11 +10480,6 @@ static void nft_trans_gc_queue_work(struct nft_trans_gc *trans)
        schedule_work(&trans_gc_work);
 }
 
-static int nft_trans_gc_space(struct nft_trans_gc *trans)
-{
-       return NFT_TRANS_GC_BATCHCOUNT - trans->count;
-}
-
 struct nft_trans_gc *nft_trans_gc_queue_async(struct nft_trans_gc *gc,
                                              unsigned int gc_seq, gfp_t gfp)
 {

diff --git a/net/netfilter/nft_set_pipapo.c b/net/netfilter/nft_set_pipapo.c
index cd0d2d4ae36bf6dd051cb2530d747b14bf427ab3..d9b74d588c768df72d30a292d36d3fb424f129d2 100644 (file)
--- a/net/netfilter/nft_set_pipapo.c
+++ b/net/netfilter/nft_set_pipapo.c
@@ -1681,11 +1681,11 @@ static void nft_pipapo_gc_deactivate(struct net *net, struct nft_set *set,
 }
 
 /**
- * pipapo_gc() - Drop expired entries from set, destroy start and end elements
+ * pipapo_gc_scan() - Drop expired entries from set and link them to gc list
  * @set:       nftables API set representation
  * @m:         Matching data
  */
-static void pipapo_gc(struct nft_set *set, struct nft_pipapo_match *m)
+static void pipapo_gc_scan(struct nft_set *set, struct nft_pipapo_match *m)
 {
        struct nft_pipapo *priv = nft_set_priv(set);
        struct net *net = read_pnet(&set->net);
@@ -1698,6 +1698,8 @@ static void pipapo_gc(struct nft_set *set, struct nft_pipapo_match *m)
        if (!gc)
                return;
 
+       list_add(&gc->list, &priv->gc_head);
+
        while ((rules_f0 = pipapo_rules_same_key(m->f, first_rule))) {
                union nft_pipapo_map_bucket rulemap[NFT_PIPAPO_MAX_FIELDS];
                const struct nft_pipapo_field *f;
@@ -1725,9 +1727,13 @@ static void pipapo_gc(struct nft_set *set, struct nft_pipapo_match *m)
                 * NFT_SET_ELEM_DEAD_BIT.
                 */
                if (__nft_set_elem_expired(&e->ext, tstamp)) {
-                       gc = nft_trans_gc_queue_sync(gc, GFP_KERNEL);
-                       if (!gc)
-                               return;
+                       if (!nft_trans_gc_space(gc)) {
+                               gc = nft_trans_gc_alloc(set, 0, GFP_KERNEL);
+                               if (!gc)
+                                       return;
+
+                               list_add(&gc->list, &priv->gc_head);
+                       }
 
                        nft_pipapo_gc_deactivate(net, set, e);
                        pipapo_drop(m, rulemap);
@@ -1741,10 +1747,30 @@ static void pipapo_gc(struct nft_set *set, struct nft_pipapo_match *m)
                }
        }
 
-       gc = nft_trans_gc_catchall_sync(gc);
+       priv->last_gc = jiffies;
+}
+
+/**
+ * pipapo_gc_queue() - Free expired elements
+ * @set:       nftables API set representation
+ */
+static void pipapo_gc_queue(struct nft_set *set)
+{
+       struct nft_pipapo *priv = nft_set_priv(set);
+       struct nft_trans_gc *gc, *next;
+
+       /* always do a catchall cycle: */
+       gc = nft_trans_gc_alloc(set, 0, GFP_KERNEL);
        if (gc) {
+               gc = nft_trans_gc_catchall_sync(gc);
+               if (gc)
+                       nft_trans_gc_queue_sync_done(gc);
+       }
+
+       /* always purge queued gc elements. */
+       list_for_each_entry_safe(gc, next, &priv->gc_head, list) {
+               list_del(&gc->list);
                nft_trans_gc_queue_sync_done(gc);
-               priv->last_gc = jiffies;
        }
 }
 
@@ -1798,6 +1824,10 @@ static void pipapo_reclaim_match(struct rcu_head *rcu)
  *
  * We also need to create a new working copy for subsequent insertions and
  * deletions.
+ *
+ * After the live copy has been replaced by the clone, we can safely queue
+ * expired elements that have been collected by pipapo_gc_scan() for
+ * memory reclaim.
  */
 static void nft_pipapo_commit(struct nft_set *set)
 {
@@ -1808,7 +1838,7 @@ static void nft_pipapo_commit(struct nft_set *set)
                return;
 
        if (time_after_eq(jiffies, priv->last_gc + nft_set_gc_interval(set)))
-               pipapo_gc(set, priv->clone);
+               pipapo_gc_scan(set, priv->clone);
 
        old = rcu_replace_pointer(priv->match, priv->clone,
                                  nft_pipapo_transaction_mutex_held(set));
@@ -1816,6 +1846,8 @@ static void nft_pipapo_commit(struct nft_set *set)
 
        if (old)
                call_rcu(&old->rcu, pipapo_reclaim_match);
+
+       pipapo_gc_queue(set);
 }
 
 static void nft_pipapo_abort(const struct nft_set *set)
@@ -2280,6 +2312,7 @@ static int nft_pipapo_init(const struct nft_set *set,
                f->mt = NULL;
        }
 
+       INIT_LIST_HEAD(&priv->gc_head);
        rcu_assign_pointer(priv->match, m);
 
        return 0;
@@ -2329,6 +2362,8 @@ static void nft_pipapo_destroy(const struct nft_ctx *ctx,
        struct nft_pipapo *priv = nft_set_priv(set);
        struct nft_pipapo_match *m;
 
+       WARN_ON_ONCE(!list_empty(&priv->gc_head));
+
        m = rcu_dereference_protected(priv->match, true);
 
        if (priv->clone) {

diff --git a/net/netfilter/nft_set_pipapo.h b/net/netfilter/nft_set_pipapo.h
index eaab422aa56ab21b8531eaae81e988c49cee2f32..9aee9a9eaeb759671db9af77504de09f1a7e2d2f 100644 (file)
--- a/net/netfilter/nft_set_pipapo.h
+++ b/net/netfilter/nft_set_pipapo.h
@@ -156,12 +156,14 @@ struct nft_pipapo_match {
  * @clone:     Copy where pending insertions and deletions are kept
  * @width:     Total bytes to be matched for one packet, including padding
  * @last_gc:   Timestamp of last garbage collection run, jiffies
+ * @gc_head:   list of nft_trans_gc to queue up for mem reclaim
  */
 struct nft_pipapo {
        struct nft_pipapo_match __rcu *match;
        struct nft_pipapo_match *clone;
        int width;
        unsigned long last_gc;
+       struct list_head gc_head;
 };
 
 struct nft_pipapo_elem;