Skip to content

Commit

Permalink
[SK_BUFF]: Fix missing offset adjustment in skb_copy_expand
Browse files Browse the repository at this point in the history
skb_copy_expand changes the headroom, so it needs to adjust the header
offsets by the difference between the old and the new value.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Patrick McHardy authored and David S. Miller committed Apr 26, 2007
1 parent 3303680 commit efd1e8d
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion net/core/skbuff.c
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,9 @@ struct sk_buff *skb_copy_expand(const struct sk_buff *skb,
*/
struct sk_buff *n = alloc_skb(newheadroom + skb->len + newtailroom,
gfp_mask);
int oldheadroom = skb_headroom(skb);
int head_copy_len, head_copy_off;
int off = 0;

if (!n)
return NULL;
Expand All @@ -746,7 +748,7 @@ struct sk_buff *skb_copy_expand(const struct sk_buff *skb,
/* Set the tail pointer and length */
skb_put(n, skb->len);

head_copy_len = skb_headroom(skb);
head_copy_len = oldheadroom;
head_copy_off = 0;
if (newheadroom <= head_copy_len)
head_copy_len = newheadroom;
Expand All @@ -760,6 +762,13 @@ struct sk_buff *skb_copy_expand(const struct sk_buff *skb,

copy_skb_header(n, skb);

#ifdef NET_SKBUFF_DATA_USES_OFFSET
off = newheadroom - oldheadroom;
#endif
n->transport_header += off;
n->network_header += off;
n->mac_header += off;

return n;
}

Expand Down

0 comments on commit efd1e8d

Please sign in to comment.