path: root/net/core
diff options
authorPravin B Shelar <>2015-09-28 17:24:25 -0700
committerDavid S. Miller <>2015-09-29 16:48:46 -0700
commit31b33dfb0a144469dd805514c9e63f4993729a48 (patch)
treefa7d2bb42af8e4f89805fbd5661f7a0d57d38132 /net/core
parent741a11d9e4103a8e1c590ef1280143fe654e4e33 (diff)
skbuff: Fix skb checksum partial check.
Earlier patch 6ae459bda tried to detect void ckecksum partial skb by comparing pull length to checksum offset. But it does not work for all cases since checksum-offset depends on updates to skb->data. Following patch fixes it by validating checksum start offset after skb-data pointer is updated. Negative value of checksum offset start means there is no need to checksum. Fixes: 6ae459bda ("skbuff: Fix skb checksum flag on skb pull") Reported-by: Andrew Vagin <> Signed-off-by: Pravin B Shelar <> Signed-off-by: David S. Miller <>
Diffstat (limited to 'net/core')
1 files changed, 5 insertions, 4 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index dad4dd37e2aa..fab4599ba8b2 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -2958,11 +2958,12 @@ EXPORT_SYMBOL_GPL(skb_append_pagefrags);
unsigned char *skb_pull_rcsum(struct sk_buff *skb, unsigned int len)
+ unsigned char *data = skb->data;
BUG_ON(len > skb->len);
- skb->len -= len;
- BUG_ON(skb->len < skb->data_len);
- skb_postpull_rcsum(skb, skb->data, len);
- return skb->data += len;
+ __skb_pull(skb, len);
+ skb_postpull_rcsum(skb, data, len);
+ return skb->data;