netfilter: nf_tables: skip transaction if update object is not implemented

[ Upstream commit 84b1a0c0140a9a92ea108576c0002210f224ce59 ]

Turn update into noop as a follow up for:

  9fedd894b4e1 ("netfilter: nf_tables: fix unexpected EOPNOTSUPP error")

instead of adding a transaction object which is simply discarded at a
later stage of the commit protocol.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Stable-dep-of: cddc04275f95 ("netfilter: nf_tables: must hold rcu read lock while iterating object type list")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 71a486d9fd76afd60d9916ea82325a578b16873f..20e2f2deb336dd3fb1402b6fedd71b0941340643 100644 (file)
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -7189,6 +7189,9 @@ static int nf_tables_newobj(struct sk_buff *skb, const struct nfnl_info *info,
                if (WARN_ON_ONCE(!type))
                        return -ENOENT;
 
+               if (!obj->ops->update)
+                       return 0;
+
                nft_ctx_init(&ctx, net, skb, info->nlh, family, table, NULL, nla);
 
                return nf_tables_updobj(&ctx, type, nla[NFTA_OBJ_DATA], obj);
@@ -8787,9 +8790,10 @@ static void nft_obj_commit_update(struct nft_trans *trans)
        obj = nft_trans_obj(trans);
        newobj = nft_trans_obj_newobj(trans);
 
-       if (obj->ops->update)
-               obj->ops->update(obj, newobj);
+       if (WARN_ON_ONCE(!obj->ops->update))
+               return;
 
+       obj->ops->update(obj, newobj);
        nft_obj_destroy(&trans->ctx, newobj);
 }