| Message ID | 1332213779-19528-1-git-send-email-gaofeng@cn.fujitsu.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, Mar 20, 2012 at 11:22:59AM +0800, Gao feng wrote: > Since commit 299b0767(ipv6: Fix IPsec slowpath fragmentation problem) > In func ip6_append_data,after call skb_put(skb, fraglen + dst_exthdrlen) > the skb->len contains dst_exthdrlen,and we don't reduce dst_exthdrlen at last > This will make fraggap>0 in next "while cycle",and cause the size of skb incorrent > > Fix this by reserve headroom for dst_exthdrlen. > > Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com> > --- > net/ipv6/ip6_output.c | 8 +++++--- > 1 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c > index d97e071..8d5d204 100644 > --- a/net/ipv6/ip6_output.c > +++ b/net/ipv6/ip6_output.c > @@ -1418,6 +1418,8 @@ alloc_new_skb: > skb->csum = 0; > /* reserve for fragmentation */ > skb_reserve(skb, hh_len+sizeof(struct frag_hdr)); > + /* reserve for ipsec header */ > + skb_reserve(skb, dst_exthdrlen); Why not 'reserve for fragmentation and ipsec header' instead of calling skb_reserve() two times? The rest of the patch looks good. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index d97e071..8d5d204 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -1418,6 +1418,8 @@ alloc_new_skb: skb->csum = 0; /* reserve for fragmentation */ skb_reserve(skb, hh_len+sizeof(struct frag_hdr)); + /* reserve for ipsec header */ + skb_reserve(skb, dst_exthdrlen); if (sk->sk_type == SOCK_DGRAM) skb_shinfo(skb)->tx_flags = tx_flags; @@ -1425,9 +1427,9 @@ alloc_new_skb: /* * Find where to start putting bytes */ - data = skb_put(skb, fraglen + dst_exthdrlen); - skb_set_network_header(skb, exthdrlen + dst_exthdrlen); - data += fragheaderlen + dst_exthdrlen; + data = skb_put(skb, fraglen); + skb_set_network_header(skb, exthdrlen); + data += fragheaderlen; skb->transport_header = (skb->network_header + fragheaderlen); if (fraggap) {
Since commit 299b0767(ipv6: Fix IPsec slowpath fragmentation problem) In func ip6_append_data,after call skb_put(skb, fraglen + dst_exthdrlen) the skb->len contains dst_exthdrlen,and we don't reduce dst_exthdrlen at last This will make fraggap>0 in next "while cycle",and cause the size of skb incorrent Fix this by reserve headroom for dst_exthdrlen. Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com> --- net/ipv6/ip6_output.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-)