Commit d1238d53 authored Mar 16, 2009 by Christoph Paasch Committed by Patrick McHardy Mar 16, 2009

netfilter: conntrack: check for NEXTHDR_NONE before header sanity checking



NEXTHDR_NONE doesn't has an IPv6 option header, so the first check
for the length will always fail and results in a confusing message
"too short" if debugging enabled. With this patch, we check for
NEXTHDR_NONE before length sanity checkings are done.

Signed-off-by: Christoph Paasch <christoph.paasch@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Patrick McHardy <kaber@trash.net>

parent ec8d5409

net/ipv6/netfilter/nf_conntrack_reasm.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -528,14 +528,14 @@ find_prev_fhdr(struct sk_buff skb, u8 prevhdrp, int prevhoff, int fhoff)
		if (!ipv6_ext_hdr(nexthdr)) {
		return -1;
		}
		if (len < (int)sizeof(struct ipv6_opt_hdr)) {
		pr_debug("too short\n");
		return -1;
		}
		if (nexthdr == NEXTHDR_NONE) {
		pr_debug("next header is none\n");
		return -1;
		}
		if (len < (int)sizeof(struct ipv6_opt_hdr)) {
		pr_debug("too short\n");
		return -1;
		}
		if (skb_copy_bits(skb, start, &hdr, sizeof(hdr)))
		BUG();
		if (nexthdr == NEXTHDR_AUTH)