From: "Rodrigo Partearroyo González" <rpartearroyo@albentia.com>
To: "Eric Dumazet" <eric.dumazet@gmail.com>
Cc: "Herbert Xu" <herbert@gondor.apana.org.au>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Iratxo Pichel Ortiz" <ipichel@albentia.com>,
"Noelia Morón" <nmoron@albentia.com>,
netdev <netdev@vger.kernel.org>
Subject: Re: [PATCH 001/001] QoS and/or fair queueing: Stateless NAT BUG
Date: Fri, 9 Jul 2010 19:19:21 +0200 [thread overview]
Message-ID: <201007091919.22524.rpartearroyo@albentia.com> (raw)
In-Reply-To: <25524.83.175.223.254.1278693359.squirrel@mail.albentia.com>
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 escribió:
> Hi all,
> I have been testing Stateless NAT and found that ICMP packets with length
> 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 smaller
> than 20 bytes were being dropped.
>
> Proposed formal patch is below, as suggested by Eric Dumazet, thanks.
> It is taken from 2.6.34.1 stable version.
>
Signed-off-by: Rodrigo Partearroyo González <rpartearroyo@albentia.com>
---
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,
{
struct icmphdr *icmph;
- if (!pskb_may_pull(skb, ihl + sizeof(*icmph) + sizeof(*iph)))
+ if (!pskb_may_pull(skb, ihl + sizeof(*icmph)))
goto drop;
icmph = (void *)(skb_network_header(skb) + ihl);
@@ -223,7 +223,7 @@ static int tcf_nat(struct sk_buff *skb,
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;
---
--
Rodrigo Partearroyo González
R&D Engineer
Albentia Systems S.A.
http://www.albentia.com
+34 914400213
C\Margarita Salas 22
Parque Tecnológico de Leganés
Leganés (28918)
Madrid
Spain
next prev parent reply other threads:[~2010-07-09 17:19 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-09 16:35 [PATCH 001/001] QoS and/or fair queueing: Stateless NAT BUG rpartearroyo
2010-07-09 17:19 ` Rodrigo Partearroyo González [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-07-09 17:37 Rodrigo Partearroyo González
2010-07-09 17:52 ` David Miller
2010-07-09 17:54 ` Eric Dumazet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201007091919.22524.rpartearroyo@albentia.com \
--to=rpartearroyo@albentia.com \
--cc=eric.dumazet@gmail.com \
--cc=herbert@gondor.apana.org.au \
--cc=ipichel@albentia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nmoron@albentia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox