lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SK_BUFF]: Fix missing offset adjustment in skb_copy_expand

Browse Source 
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>
This commit is contained in:
Patrick McHardy
2007-04-10 18:30:09 -07:00
committed by David S. Miller
parent 33036807b3
commit efd1e8d569
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
net/core/skbuff.c
View File

@@ -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, struct sk_buff *n = alloc_skb(newheadroom + skb->len + newtailroom,
gfp_mask); gfp_mask);
int oldheadroom = skb_headroom(skb);
int head_copy_len, head_copy_off; int head_copy_len, head_copy_off;
int off = 0;
if (!n) if (!n)
return NULL; return NULL;
@@ -746,7 +748,7 @@ struct sk_buff *skb_copy_expand(const struct sk_buff *skb,
/* Set the tail pointer and length */ /* Set the tail pointer and length */
skb_put(n, skb->len); skb_put(n, skb->len);
head_copy_len = skb_headroom(skb); head_copy_len = oldheadroom;
head_copy_off = 0; head_copy_off = 0;
if (newheadroom <= head_copy_len) if (newheadroom <= head_copy_len)
head_copy_len = newheadroom; head_copy_len = newheadroom;
@@ -760,6 +762,13 @@ struct sk_buff *skb_copy_expand(const struct sk_buff *skb,
copy_skb_header(n, 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; return n;
} }