diff options
| author | Florian Westphal <fw@strlen.de> | 2016-06-06 21:52:28 +0200 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2016-06-07 00:54:22 +0200 |
| commit | 3503738f77cdbe521da1054a37f59ac2e442b4cf (patch) | |
| tree | 144d072b8baee81558c1334b47c5d7186d888f2c /src/payload.c | |
| parent | ba145d3ee951c5c90cd00bb317f06ddbb0451539 (diff) | |
payload: don't update protocol context if we can't find a description
Since commit
20b1131c07acd2fc ("payload: fix stacked headers protocol context tracking")
we deref null pointer if we can't find a description for the desired
protocol, so "ip protocol 254" crashes while testing protocols 6 or 17
(tcp, udp) works.
Also add a test case for this.
Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=1072
Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/payload.c')
| -rw-r--r-- | src/payload.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/payload.c b/src/payload.c index ac0e917a..9ba980a5 100644 --- a/src/payload.c +++ b/src/payload.c @@ -85,6 +85,9 @@ static void payload_expr_pctx_update(struct proto_ctx *ctx, base = ctx->protocol[left->payload.base].desc; desc = proto_find_upper(base, proto); + if (!desc) + return; + assert(desc->base <= PROTO_BASE_MAX); if (desc->base == base->base) { assert(base->length > 0); |