netfilter: nf_tables: Fix an Oops in nf_tables_updobj() error handling
Subsystems (3)
PATCH 1/1 netfilter: nf_tables: Fix an Oops in nf_tables_updobj() error handling
The "newobj" is an error pointer so we can't pass it to kfree(). It doesn't need to be freed so we can remove that and I also renamed the error label.
Fixes d62d0ba97b58 ("netfilter: nf_tables: Introduce stateful object update operation")
Signed-off-by Dan Carpenter <[email protected]>
--- net/netfilter/nf_tables_api.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/netfilter/nf_tables_api.c +3 -3
@@ -5148,7 +5148,7 @@ static int nf_tables_updobj(const struct nft_ctx *ctx, newobj =nft_obj_init (ctx, type, attr);if (IS_ERR (newobj)) { err =PTR_ERR (newobj); - goto err1; + goto err_free_trans; }nft_trans_obj (trans) = obj;
@@ -5157,9 +5157,9 @@ static int nf_tables_updobj(const struct nft_ctx *ctx,list_add_tail (&trans->list, &ctx->net->nft.commit_list);return 0 ; -err1: + +err_free_trans:kfree (trans); -kfree (newobj);return err; }
Signature · 1 line
2.20.1
Oh sorry, I missed that. Thanks!
Quoted 36 lines · Dan Carpenter
The "newobj" is an error pointer so we can't pass it to
kfree(). It doesn't need to be freed so we can remove that and I also renamed the error label.Fixes d62d0ba97b58 ("netfilter: nf_tables: Introduce stateful object update operation")Signed-off-by Dan Carpenter <[email protected]>--- net/netfilter/nf_tables_api.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)net/netfilter/nf_tables_api.c +3
-3@@ -5148,7 +5148,7 @@ static int nf_tables_updobj(const struct nft_ctx *ctx, newobj =nft_obj_init (ctx, type, attr);if (IS_ERR (newobj)) { err =PTR_ERR (newobj); - goto err1; + goto err_free_trans; }nft_trans_obj (trans) = obj;@@ -5157,9 +5157,9 @@ static int nf_tables_updobj(const struct nft_ctx *ctx,list_add_tail (&trans->list, &ctx->net->nft.commit_list);return 0 ; -err1: + +err_free_trans:kfree (trans); -kfree (newobj);return err; }
Quoted 3 lines · Dan Carpenter
The "newobj" is an error pointer so we can't pass it to
kfree(). It doesn't need to be freed so we can remove that and I also renamed the error label.
Applied, thanks.