aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>2007-07-14 23:44:23 -0400
committerDavid S. Miller <davem@davemloft.net>2007-07-14 23:44:23 -0400
commitd87d8469e2dd19a3a134b99f78288d41854c614b (patch)
treec976ea2c818ecfb1fb3b6d96eaa2bd7859c19d09
parent6460d948f3ebf7d5040328a60a0ab7221f69945b (diff)
[NETFILTER]: nf_conntrack: Increment error count on parsing IPv4 header
Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c2
-rw-r--r--net/netfilter/nf_conntrack_core.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
index 89e20ab494b8..b5c4bb54691e 100644
--- a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
+++ b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
@@ -131,8 +131,6 @@ ipv6_prepare(struct sk_buff **pskb, unsigned int hooknum, unsigned int *dataoff,
131 */ 131 */
132 if ((protoff < 0) || (protoff > (*pskb)->len)) { 132 if ((protoff < 0) || (protoff > (*pskb)->len)) {
133 pr_debug("ip6_conntrack_core: can't find proto in pkt\n"); 133 pr_debug("ip6_conntrack_core: can't find proto in pkt\n");
134 NF_CT_STAT_INC_ATOMIC(error);
135 NF_CT_STAT_INC_ATOMIC(invalid);
136 return -NF_ACCEPT; 134 return -NF_ACCEPT;
137 } 135 }
138 136
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 3d1411012a2c..b730413738a6 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -625,6 +625,8 @@ nf_conntrack_in(int pf, unsigned int hooknum, struct sk_buff **pskb)
625 625
626 if ((ret = l3proto->prepare(pskb, hooknum, &dataoff, &protonum)) <= 0) { 626 if ((ret = l3proto->prepare(pskb, hooknum, &dataoff, &protonum)) <= 0) {
627 pr_debug("not prepared to track yet or error occured\n"); 627 pr_debug("not prepared to track yet or error occured\n");
628 NF_CT_STAT_INC_ATOMIC(error);
629 NF_CT_STAT_INC_ATOMIC(invalid);
628 return -ret; 630 return -ret;
629 } 631 }
630 632