netfilter stable fixes for 4.19
Subsystems (2)
Pablo Neira Ayuso
maintainercover netfilter stable fixes for 4.19
Hi Greg, Sasha,
This is a backport of:
faff4e4ecd28 ("netfilter: nf_tables: bogus EBUSY when deleting flowtable after flush") 1689f25924ad ("netfilter: nf_tables: report use refcount overflow")
for -stable 4.19.
Please, apply.
Thanks.
Laura Garcia Liebana (1):
netfilter: nf_tables: bogus EBUSY when deleting flowtable after flush
Pablo Neira Ayuso (1):
netfilter: nf_tables: report use refcount overflow
include/net/netfilter/nf_tables.h | 35 +++++- net/netfilter/nf_tables_api.c | 180 ++++++++++++++++++++---------- net/netfilter/nft_flow_offload.c | 23 +++- net/netfilter/nft_objref.c | 8 +- 4 files changed, 177 insertions(+), 69 deletions(-)
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 1/2 netfilter: nf_tables: bogus EBUSY when deleting flowtable after flush
From: Laura Garcia Liebana <[email protected]>
commit 9b05b6e11d5e93a3a517cadc12b9836e0470c255 upstream.
The deletion of a flowtable after a flush in the same transaction results in EBUSY. This patch adds an activation and deactivation of flowtables in order to update the _use_ counter.
--- include/net/netfilter/nf_tables.h | 4 ++++ net/netfilter/nf_tables_api.c | 16 ++++++++++++++++ net/netfilter/nft_flow_offload.c | 19 +++++++++++++++++++ 3 files changed, 39 insertions(+)
include/net/netfilter/nf_tables.h +4 -0
@@ -1161,6 +1161,10 @@ struct nft_flowtable *nft_flowtable_lookup(const struct nft_table *table,const struct nlattr *nla, u8 genmask); +void nf_tables_deactivate_flowtable (const struct nft_ctx *ctx, +struct nft_flowtable *flowtable, +enum nft_trans_phase phase); +void nft_register_flowtable_type (struct nf_flowtable_type *type);void nft_unregister_flowtable_type (struct nf_flowtable_type *type);
net/netfilter/nf_tables_api.c +16 -0
@@ -5519,6 +5519,22 @@ struct nft_flowtable *nft_flowtable_lookup(const struct nft_table *table, }EXPORT_SYMBOL_GPL (nft_flowtable_lookup); +void nf_tables_deactivate_flowtable (const struct nft_ctx *ctx, +struct nft_flowtable *flowtable, +enum nft_trans_phase phase) +{ +switch (phase) { +case NFT_TRANS_PREPARE : +case NFT_TRANS_ABORT : +case NFT_TRANS_RELEASE : + flowtable->use--; +/* fall through */ +default : +return ; + } +} +EXPORT_SYMBOL_GPL (nf_tables_deactivate_flowtable); +static struct nft_flowtable *nft_flowtable_lookup_byhandle (const struct nft_table *table,const struct nlattr *nla,u8 genmask)
net/netfilter/nft_flow_offload.c +19 -0
@@ -175,6 +175,23 @@ static int nft_flow_offload_init(const struct nft_ctx *ctx,return nf_ct_netns_get (ctx->net, ctx->family); } +static void nft_flow_offload_deactivate (const struct nft_ctx *ctx, +const struct nft_expr *expr, +enum nft_trans_phase phase) +{ +struct nft_flow_offload *priv =nft_expr_priv (expr); + +nf_tables_deactivate_flowtable (ctx, priv->flowtable, phase); +} + +static void nft_flow_offload_activate (const struct nft_ctx *ctx, +const struct nft_expr *expr) +{ +struct nft_flow_offload *priv =nft_expr_priv (expr); + + priv->flowtable->use++; +} +static void nft_flow_offload_destroy (const struct nft_ctx *ctx,const struct nft_expr *expr) {
@@ -203,6 +220,8 @@ static const struct nft_expr_ops nft_flow_offload_ops = { .size = NFT_EXPR_SIZE(sizeof(struct nft_flow_offload)), .eval = nft_flow_offload_eval, .init = nft_flow_offload_init, + .activate = nft_flow_offload_activate, + .deactivate = nft_flow_offload_deactivate, .destroy = nft_flow_offload_destroy, .validate = nft_flow_offload_validate, .dump = nft_flow_offload_dump,
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 2/2 netfilter: nf_tables: report use refcount overflow
In reply to Pablo Neira Ayusocommit 1689f25924ada8fe14a4a82c38925d04994c7142 upstream.
Overflow use refcount checks are not complete.
Add helper function to deal with object reference counter tracking. Report -EMFILE in case UINT_MAX is reached.
nft_use_dec() splats in case that reference counter underflows, which should not ever happen.
Add nft_use_inc_restore() and nft_use_dec_restore() which are used to restore reference counter from error and abort paths.
Use u32 in nft_flowtable and nft_object since helper functions cannot work on bitfields.
Remove the few early incomplete checks now that the helper functions are in place and used to check for refcount overflow.
--- include/net/netfilter/nf_tables.h | 31 +++++- net/netfilter/nf_tables_api.c | 166 +++++++++++++++++++----------- net/netfilter/nft_flow_offload.c | 6 +- net/netfilter/nft_objref.c | 8 +- 4 files changed, 140 insertions(+), 71 deletions(-)
include/net/netfilter/nf_tables.h +27 -4
@@ -992,6 +992,29 @@ int __nft_release_basechain(struct nft_ctx *ctx);unsigned int nft_do_chain (struct nft_pktinfo *pkt,void *priv); +static inline bool nft_use_inc (u32 *use) +{ +if (*use ==UINT_MAX ) +return false; + + (*use)++; + +return true; +} + +static inline void nft_use_dec (u32 *use) +{ +WARN_ON_ONCE ((*use)-- ==0 ); +} + +/* For error and abort path: restore use counter to previous state. */ +static inline void nft_use_inc_restore (u32 *use) +{ +WARN_ON_ONCE (!nft_use_inc (use)); +} + +#define nft_use_dec_restore nft_use_dec +/** * struct nft_table - nf_tables table *
@@ -1050,8 +1073,8 @@ struct nft_object {struct list_head list;char *name;struct nft_table *table; - u32 genmask:2, - use:30; + u32 genmask:2; +u32 use;u64 handle;/* runtime data below here */ const struct nft_object_ops *ops____cacheline_aligned ;
@@ -1149,8 +1172,8 @@ struct nft_flowtable {int hooknum;int priority;int ops_len; - u32 genmask:2, - use:30; + u32 genmask:2; +u32 use;u64 handle;/* runtime data below here */ struct nf_hook_ops *ops____cacheline_aligned ;
net/netfilter/nf_tables_api.c +104 -62
515 lines not on this page · raw message
net/netfilter/nft_flow_offload.c +4 -2
@@ -169,8 +169,10 @@ static int nft_flow_offload_init(const struct nft_ctx *ctx,if (IS_ERR (flowtable))return PTR_ERR (flowtable); +if (!nft_use_inc (&flowtable->use)) +return -EMFILE ; + priv->flowtable = flowtable; - flowtable->use++;return nf_ct_netns_get (ctx->net, ctx->family); }
@@ -189,7 +191,7 @@ static void nft_flow_offload_activate(const struct nft_ctx *ctx, {struct nft_flow_offload *priv =nft_expr_priv (expr); - priv->flowtable->use++; +nft_use_inc_restore (&priv->flowtable->use); } static void nft_flow_offload_destroy(const struct nft_ctx *ctx,
net/netfilter/nft_objref.c +5 -3
@@ -43,8 +43,10 @@ static int nft_objref_init(const struct nft_ctx *ctx,if (IS_ERR (obj))return -ENOENT ; +if (!nft_use_inc (&obj->use)) +return -EMFILE ; +nft_objref_priv (expr) = obj; - obj->use++;return 0 ; }
@@ -73,7 +75,7 @@ static void nft_objref_deactivate(const struct nft_ctx *ctx,if (phase ==NFT_TRANS_COMMIT )return ; - obj->use--; +nft_use_dec (&obj->use); } static void nft_objref_activate(const struct nft_ctx *ctx,
@@ -81,7 +83,7 @@ static void nft_objref_activate(const struct nft_ctx *ctx, {struct nft_object *obj =nft_objref_priv (expr); - obj->use++; +nft_use_inc_restore (&obj->use); }static struct nft_expr_type nft_objref_type;
Signature · 1 line
2.30.2