Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d87d8469 authored by Yasuyuki Kozakai's avatar Yasuyuki Kozakai Committed by David S. Miller
Browse files

[NETFILTER]: nf_conntrack: Increment error count on parsing IPv4 header 



Signed-off-by: default avatarYasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6460d948

net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c

+0 −2
Original line number Diff line number Diff line
@@ -131,8 +131,6 @@ ipv6_prepare(struct sk_buff **pskb, unsigned int hooknum, unsigned int *dataoff, 
	 */

	if ((protoff < 0) || (protoff > (*pskb)->len)) {

		pr_debug("ip6_conntrack_core: can't find proto in pkt\n");

		NF_CT_STAT_INC_ATOMIC(error);

		NF_CT_STAT_INC_ATOMIC(invalid);

		return -NF_ACCEPT;

	}

net/netfilter/nf_conntrack_core.c

+2 −0
Original line number Diff line number Diff line
@@ -625,6 +625,8 @@ nf_conntrack_in(int pf, unsigned int hooknum, struct sk_buff **pskb) 


	if ((ret = l3proto->prepare(pskb, hooknum, &dataoff, &protonum)) <= 0) {

		pr_debug("not prepared to track yet or error occured\n");

		NF_CT_STAT_INC_ATOMIC(error);

		NF_CT_STAT_INC_ATOMIC(invalid);

		return -ret;

	}