All of lore.kernel.org
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Subject: [PATCH nft,v3 5/9] evaluate: fix crash when handling concatenation without map
Date: Tue, 28 Apr 2020 17:41:16 +0200	[thread overview]
Message-ID: <20200428154120.20061-6-pablo@netfilter.org> (raw)
In-Reply-To: <20200428154120.20061-1-pablo@netfilter.org>

Fix a crash when map is not specified, e.g.

 nft add rule x y snat ip addr . port to 1.1.1.1 . 22

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 src/evaluate.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/evaluate.c b/src/evaluate.c
index cad65cfb7343..8c227eb11402 100644
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -2924,6 +2924,9 @@ static int stmt_evaluate_nat_map(struct eval_ctx *ctx, struct stmt *stmt)
 	if (expr_evaluate(ctx, &stmt->nat.addr))
 		return -1;
 
+	if (stmt->nat.addr->etype != EXPR_MAP)
+		return 0;
+
 	data = stmt->nat.addr->mappings->set->data;
 	datatype_set(data, dtype);
 
-- 
2.20.1


  parent reply	other threads:[~2020-04-28 15:41 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-28 15:41 [PATCH nft,v3 0/9] netmap support for nft Pablo Neira Ayuso
2020-04-28 15:41 ` [PATCH nft,v3 1/9] src: NAT support for intervals in maps Pablo Neira Ayuso
2020-04-28 15:41 ` [PATCH nft,v3 2/9] include: resync nf_nat.h kernel header Pablo Neira Ayuso
2020-04-28 15:41 ` [PATCH nft,v3 3/9] src: add netmap support Pablo Neira Ayuso
2020-04-28 15:41 ` [PATCH nft,v3 4/9] src: add STMT_NAT_F_CONCAT flag and use it Pablo Neira Ayuso
2020-04-28 15:41 ` Pablo Neira Ayuso [this message]
2020-04-28 15:41 ` [PATCH nft,v3 6/9] tests: py: concatenation, netmap and nat mappings Pablo Neira Ayuso
2020-04-28 15:41 ` [PATCH nft,v3 7/9] mnl: restore --debug=netlink output with sets Pablo Neira Ayuso
2020-04-28 15:41 ` [PATCH nft,v3 8/9] tests: py: remove range test with service names Pablo Neira Ayuso
2020-04-28 15:41 ` [PATCH nft,v3 9/9] tests: shell: add NAT mappings tests 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=20200428154120.20061-6-pablo@netfilter.org \
    --to=pablo@netfilter.org \
    --cc=netfilter-devel@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.