Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[linux-2.6] / net / bridge / netfilter / ebt_ip.c

diff --git a/net/bridge/netfilter/ebt_ip.c b/net/bridge/netfilter/ebt_ip.c
index 7323805b97263c14b348cf7066604acdb897a112..f158fe67dd605fd8ca3dd5b941df04147d0d277f 100644 (file)
--- a/net/bridge/netfilter/ebt_ip.c
+++ b/net/bridge/netfilter/ebt_ip.c
@@ -15,6 +15,7 @@
 #include <linux/netfilter_bridge/ebtables.h>
 #include <linux/netfilter_bridge/ebt_ip.h>
 #include <linux/ip.h>
+#include <net/ip.h>
 #include <linux/in.h>
 #include <linux/module.h>
 
@@ -51,6 +52,8 @@ static int ebt_filter_ip(const struct sk_buff *skb, const struct net_device *in,
                if (!(info->bitmask & EBT_IP_DPORT) &&
                    !(info->bitmask & EBT_IP_SPORT))
                        return EBT_MATCH;
+               if (ntohs(ih->frag_off) & IP_OFFSET)
+                       return EBT_NOMATCH;
                pptr = skb_header_pointer(skb, ih->ihl*4,
                                          sizeof(_ports), &_ports);
                if (pptr == NULL)