From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6•org>
To: netdev@vger•kernel.org, davem@davemloft•net
Cc: yoshfuji@linux-ipv6•org
Subject: [PATCH] ndisc: Ensure to reserve header space for encapsulation.
Date: Tue, 25 Dec 2012 23:39:32 +0900 [thread overview]
Message-ID: <50D9BAA4.7000207@linux-ipv6.org> (raw)
We allocate sk_buff of MAX_HEADER + LL_RESERVED_SPACE(dev) + packet
length + dev->needed_tailroom, but reserved LL_RESERVED_SPACE(dev)
only. This means that space for encapsulation was placed at the end
of buffer. This does not make sense.
Reserve the space correctly, like this:
head data tail end
+--------------------------------------------------------------+
+ | | | |
+--------------------------------------------------------------+
|<--MAX_HEADER-->|<-hlen---->|<---ipv6 packet------>|<--tlen-->|
=LL_
RESERVED_
SPACE(dev)
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6•org>
---
net/ipv6/ndisc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 6574175..5f78ac2 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -404,7 +404,7 @@ static struct sk_buff *ndisc_build_skb(struct net_device *dev,
return NULL;
}
- skb_reserve(skb, hlen);
+ skb_reserve(skb, MAX_HEADER + hlen);
ip6_nd_hdr(sk, skb, dev, saddr, daddr, IPPROTO_ICMPV6, len);
skb->transport_header = skb->tail;
@@ -1449,7 +1449,7 @@ void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target)
goto release;
}
- skb_reserve(buff, hlen);
+ skb_reserve(buff, MAX_HEADER + hlen);
ip6_nd_hdr(sk, buff, dev, &saddr_buf, &ipv6_hdr(skb)->saddr,
IPPROTO_ICMPV6, len);
--
1.7.9.5
next reply other threads:[~2012-12-25 14:39 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-25 14:39 YOSHIFUJI Hideaki [this message]
2012-12-26 16:48 ` [PATCH] ndisc: Ensure to reserve header space for encapsulation Eric Dumazet
2012-12-26 19:08 ` YOSHIFUJI Hideaki
2012-12-26 19:21 ` 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=50D9BAA4.7000207@linux-ipv6.org \
--to=yoshfuji@linux-ipv6$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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