netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Phil Sutter <phil@nwl.cc>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: netfilter-devel@vger.kernel.org
Subject: [nft PATCH 4/4] parser: Fix for memleak when commands fail
Date: Thu, 24 Aug 2017 19:14:13 +0200	[thread overview]
Message-ID: <20170824171413.31737-5-phil@nwl.cc> (raw)
In-Reply-To: <20170824171413.31737-1-phil@nwl.cc>

In case of failing command evaluation, commands need to be freed as
their memory becomes orphaned afterwards.

Signed-off-by: Phil Sutter <phil@nwl.cc>
---
 src/parser_bison.y | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/parser_bison.y b/src/parser_bison.y
index a8b71cddc1920..d149178c2679b 100644
--- a/src/parser_bison.y
+++ b/src/parser_bison.y
@@ -692,6 +692,7 @@ input			:	/* empty */
 
 					list_add_tail(&$2->list, &list);
 					if (cmd_evaluate(&state->ectx, $2) < 0) {
+						cmd_free($2);
 						if (++state->nerrs == nft->parser_max_errors)
 							YYABORT;
 					} else
@@ -758,6 +759,7 @@ line			:	common_block			{ $$ = NULL; }
 
 					list_add_tail(&$1->list, &list);
 					if (cmd_evaluate(&state->ectx, $1) < 0) {
+						cmd_free($1);
 						if (++state->nerrs == nft->parser_max_errors)
 							YYABORT;
 					} else
-- 
2.13.1


  parent reply	other threads:[~2017-08-24 17:14 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-24 17:14 [nft PATCH 0/4] Memleak fixes and some minor cleanups Phil Sutter
2017-08-24 17:14 ` [nft PATCH 1/4] scanner: Fix for memleak due to unclosed file pointer Phil Sutter
2017-08-24 17:14 ` [nft PATCH 2/4] scanner: Fix for wrong parameter type of scanner_destroy() Phil Sutter
2017-08-24 17:14 ` [nft PATCH 3/4] scanner: Make use of yylex_init_extra() Phil Sutter
2017-08-24 17:14 ` Phil Sutter [this message]
2017-08-24 17:19 ` [nft PATCH 0/4] Memleak fixes and some minor cleanups Pablo Neira Ayuso

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170824171413.31737-5-phil@nwl.cc \
    --to=phil@nwl.cc \
    --cc=netfilter-devel@vger.kernel.org \
    --cc=pablo@netfilter.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).