Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=0fb96701376874c9f1f80322f89a5bf4457c709f
Commit:     0fb96701376874c9f1f80322f89a5bf4457c709f
Parent:     66eb50d5c972cc16df2be730497b7f06d75d8132
Author:     Patrick McHardy <[EMAIL PROTECTED]>
AuthorDate: Tue Sep 11 11:27:01 2007 +0200
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Tue Sep 11 11:27:01 2007 +0200

    [NETFILTER]: nf_conntrack_ipv4: fix "Frag of proto ..." messages
    
    Since we're now using a generic tuple decoding function in ICMP
    connection tracking, ipv4_get_l4proto() might get called with a
    fragmented packet from within an ICMP error. Remove the error
    message we used to print when this happens.
    
    Signed-off-by: Patrick McHardy <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c 
b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
index d9b5177..53cb177 100644
--- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
@@ -87,14 +87,10 @@ static int ipv4_get_l4proto(const struct sk_buff *skb, 
unsigned int nhoff,
        if (iph == NULL)
                return -NF_DROP;
 
-       /* Never happen */
-       if (iph->frag_off & htons(IP_OFFSET)) {
-               if (net_ratelimit()) {
-                       printk(KERN_ERR "ipv4_get_l4proto: Frag of proto %u\n",
-                       iph->protocol);
-               }
+       /* Conntrack defragments packets, we might still see fragments
+        * inside ICMP packets though. */
+       if (iph->frag_off & htons(IP_OFFSET))
                return -NF_DROP;
-       }
 
        *dataoff = nhoff + (iph->ihl << 2);
        *protonum = iph->protocol;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to