VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / net / ipv4 / netfilter / ipt_LOG.c

diff --git a/net/ipv4/netfilter/ipt_LOG.c b/net/ipv4/netfilter/ipt_LOG.c
index 0f1b881..b79962e 100644 (file)
--- a/net/ipv4/netfilter/ipt_LOG.c
+++ b/net/ipv4/netfilter/ipt_LOG.c
@@ -76,7 +76,7 @@ static void dump_packet(const struct ipt_log_info *info,
                printk("FRAG:%u ", ntohs(iph.frag_off) & IP_OFFSET);
 
        if ((info->logflags & IPT_LOG_IPOPT)
-           && iph.ihl * 4 != sizeof(struct iphdr)) {
+           && iph.ihl * 4 > sizeof(struct iphdr)) {
                unsigned char opt[4 * 15 - sizeof(struct iphdr)];
                unsigned int i, optsize;
 
@@ -143,7 +143,7 @@ static void dump_packet(const struct ipt_log_info *info,
                printk("URGP=%u ", ntohs(tcph.urg_ptr));
 
                if ((info->logflags & IPT_LOG_TCPOPT)
-                   && tcph.doff * 4 != sizeof(struct tcphdr)) {
+                   && tcph.doff * 4 > sizeof(struct tcphdr)) {
                        unsigned char opt[4 * 15 - sizeof(struct tcphdr)];
                        unsigned int i, optsize;