releases/2.6.22.15/netfilter-xt_tcpmss-remove-network-triggerable-warn_on.patch

   1 From herbert@gondor.apana.org.au Wed Dec 12 20:42:39 2007
   2 From: Patrick McHardy <kaber@trash.net>
   3 Date: Thu, 13 Dec 2007 12:42:34 +0800
   4 Subject: NETFILTER: xt_TCPMSS: remove network triggerable WARN_ON
   5 To: Greg KH <greg@kroah.com>
   6 Cc: stable@kernel.org, <davem@davemloft.net>
   7 Message-ID: <20071213044234.GA1576@gondor.apana.org.au>
   8 Content-Disposition: inline
   9
  10 From: Patrick McHardy <kaber@trash.net>
  11
  12 [NETFILTER]: xt_TCPMSS: remove network triggerable WARN_ON
  13
  14 [ Upstream commit: 9dc0564e862b1b9a4677dec2c736b12169e03e99 ]
  15
  16 ipv6_skip_exthdr() returns -1 for invalid packets. don't WARN_ON
  17 that.
  18
  19 Signed-off-by: Patrick McHardy <kaber@trash.net>
  20 Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  21 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  22
  23 ---
  24  net/netfilter/xt_TCPMSS.c |    4 +---
  25  1 file changed, 1 insertion(+), 3 deletions(-)
  26
  27 --- a/net/netfilter/xt_TCPMSS.c
  28 +++ b/net/netfilter/xt_TCPMSS.c
  29 @@ -178,10 +178,8 @@ xt_tcpmss_target6(struct sk_buff **pskb,
  30
  31         nexthdr = ipv6h->nexthdr;
  32         tcphoff = ipv6_skip_exthdr(*pskb, sizeof(*ipv6h), &nexthdr);
  33 -       if (tcphoff < 0) {
  34 -               WARN_ON(1);
  35 +       if (tcphoff < 0)
  36                 return NF_DROP;
  37 -       }
  38         ret = tcpmss_mangle_packet(pskb, targinfo, tcphoff,
  39                                    sizeof(*ipv6h) + sizeof(struct tcphdr));
  40         if (ret < 0)