projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cdc74c9
)
netfilter: nf_tables: skip transaction if update object is not implemented
author
Pablo Neira Ayuso
<pablo@netfilter.org>
Tue, 5 Mar 2024 08:35:48 +0000
(09:35 +0100)
committer
Pablo Neira Ayuso
<pablo@netfilter.org>
Mon, 6 May 2024 09:13:54 +0000
(11:13 +0200)
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>
net/netfilter/nf_tables_api.c
patch
|
blob
|
history
diff --git
a/net/netfilter/nf_tables_api.c
b/net/netfilter/nf_tables_api.c
index 167074283ea91dff50a7aa0299a5794bcddeb32a..a7f54eb68d9a003c6275b5936f893370c0bf93a1 100644
(file)
--- a/
net/netfilter/nf_tables_api.c
+++ b/
net/netfilter/nf_tables_api.c
@@
-7776,6
+7776,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);
@@
-9467,9
+9470,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);
}