From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rodrigo Partearroyo =?iso-8859-1?q?Gonz=E1lez?= Subject: Re: [PATCH 001/001] QoS and/or fair queueing: Stateless NAT BUG Date: Fri, 9 Jul 2010 19:19:21 +0200 Message-ID: <201007091919.22524.rpartearroyo@albentia.com> References: <25524.83.175.223.254.1278693359.squirrel@mail.albentia.com> Mime-Version: 1.0 Content-Type: Text/Plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: "Herbert Xu" , "Linux Kernel Mailing List" , "Iratxo Pichel Ortiz" , Noelia =?iso-8859-1?q?Mor=F3n?= , "netdev" To: "Eric Dumazet" Return-path: In-Reply-To: <25524.83.175.223.254.1278693359.squirrel@mail.albentia.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org Seems like the mailer corrupted the patch. Sorry, I resend it. Thanks Eric. On Viernes, 9 de Julio de 2010 18:35:59 rpartearroyo@albentia.com escri= bi=F3: > Hi all, > I have been testing Stateless NAT and found that ICMP packets with le= ngth > less than 20 bytes were not correctly NAT'ed. I have found a BUG that > makes taking into account IP header length twice, so ICMP packets sma= ller > than 20 bytes were being dropped. >=20 > Proposed formal patch is below, as suggested by Eric Dumazet, thanks. > It is taken from 2.6.34.1 stable version. >=20 Signed-off-by: Rodrigo Partearroyo Gonz=E1lez --- diff -uprN a/net/sched/act_nat.c b/net/sched/act_nat.c --- a/net/sched/act_nat.c 2010-07-09 18:25:18.000000000 +0200 +++ b/net/sched/act_nat.c 2010-07-09 18:26:16.000000000 +0200 @@ -202,7 +202,7 @@ static int tcf_nat(struct sk_buff *skb,=20 { struct icmphdr *icmph; =20 - if (!pskb_may_pull(skb, ihl + sizeof(*icmph) + sizeof(*iph))) + if (!pskb_may_pull(skb, ihl + sizeof(*icmph))) goto drop; =20 icmph =3D (void *)(skb_network_header(skb) + ihl); @@ -223,7 +223,7 @@ static int tcf_nat(struct sk_buff *skb,=20 =20 if (skb_cloned(skb) && !skb_clone_writable(skb, - ihl + sizeof(*icmph) + sizeof(*iph)) && + ihl + sizeof(*icmph) ) && pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) goto drop; --- --=20 Rodrigo Partearroyo Gonz=E1lez R&D Engineer Albentia Systems S.A. http://www.albentia.com +34 914400213 C\Margarita Salas 22 Parque Tecnol=F3gico de Legan=E9s Legan=E9s (28918) Madrid Spain