* [nft PATCH v3] evaluate: fix a crash if we specify ether type or meta nfproto in reject
@ 2014-10-20 13:32 Alvaro Neira Ayuso
2014-10-21 8:12 ` Pablo Neira Ayuso
0 siblings, 1 reply; 2+ messages in thread
From: Alvaro Neira Ayuso @ 2014-10-20 13:32 UTC (permalink / raw)
To: netfilter-devel; +Cc: kaber
If we use this rule:
nft add rule bridge filter input \
ether type ip reject with icmp type host-unreachable
or that:
nft add rule inet filter input \
meta nfproto ipv4 reject with icmp type host-unreachable
we have a segfault because we add a network dependency when we already have
network context.
Signed-off-by: Alvaro Neira Ayuso <alvaroneay@gmail.com>
---
src/evaluate.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/evaluate.c b/src/evaluate.c
index d61d76b..1fec120 100644
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -1142,7 +1142,7 @@ static int reject_payload_gen_dependency_tcp(struct eval_ctx *ctx,
return 0;
*payload = payload_expr_alloc(&stmt->location, &proto_tcp,
TCPHDR_UNSPEC);
- return 0;
+ return 1;
}
static int reject_payload_gen_dependency_family(struct eval_ctx *ctx,
@@ -1171,7 +1171,7 @@ static int reject_payload_gen_dependency_family(struct eval_ctx *ctx,
default:
BUG("unknown reject family");
}
- return 0;
+ return 1;
}
static int stmt_reject_gen_dependency(struct eval_ctx *ctx, struct stmt *stmt,
@@ -1179,21 +1179,21 @@ static int stmt_reject_gen_dependency(struct eval_ctx *ctx, struct stmt *stmt,
{
struct expr *payload = NULL;
struct stmt *nstmt;
+ int ret;
switch (stmt->reject.type) {
case NFT_REJECT_TCP_RST:
- if (reject_payload_gen_dependency_tcp(ctx, stmt, &payload) < 0)
- return -1;
+ ret = reject_payload_gen_dependency_tcp(ctx, stmt, &payload);
break;
case NFT_REJECT_ICMP_UNREACH:
- if (reject_payload_gen_dependency_family(ctx, stmt,
- &payload) < 0)
- return -1;
+ ret = reject_payload_gen_dependency_family(ctx, stmt, &payload);
break;
default:
BUG("cannot generate reject dependency for type %d",
stmt->reject.type);
}
+ if (ret <= 0)
+ return ret;
if (payload_gen_dependency(ctx, payload, &nstmt) < 0)
return -1;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [nft PATCH v3] evaluate: fix a crash if we specify ether type or meta nfproto in reject
2014-10-20 13:32 [nft PATCH v3] evaluate: fix a crash if we specify ether type or meta nfproto in reject Alvaro Neira Ayuso
@ 2014-10-21 8:12 ` Pablo Neira Ayuso
0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2014-10-21 8:12 UTC (permalink / raw)
To: Alvaro Neira Ayuso; +Cc: netfilter-devel, kaber
On Mon, Oct 20, 2014 at 03:32:09PM +0200, Alvaro Neira Ayuso wrote:
> If we use this rule:
>
> nft add rule bridge filter input \
> ether type ip reject with icmp type host-unreachable
>
> or that:
>
> nft add rule inet filter input \
> meta nfproto ipv4 reject with icmp type host-unreachable
>
> we have a segfault because we add a network dependency when we already have
> network context.
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-10-21 8:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-20 13:32 [nft PATCH v3] evaluate: fix a crash if we specify ether type or meta nfproto in reject Alvaro Neira Ayuso
2014-10-21 8:12 ` Pablo Neira Ayuso
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).