Commit fc3befaa authored by Pravin B Shelar's avatar Pravin B Shelar Committed by Luis Henriques

skbuff: Fix skb checksum partial check.

commit 31b33dfb upstream.

Earlier patch 6ae459bd 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: 6ae459bd ("skbuff: Fix skb checksum flag on skb pull")
Reported-by: default avatarAndrew Vagin <avagin@odin.com>
Signed-off-by: default avatarPravin B Shelar <pshelar@nicira.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent a5162a04
...@@ -2439,7 +2439,7 @@ static inline void skb_postpull_rcsum(struct sk_buff *skb, ...@@ -2439,7 +2439,7 @@ static inline void skb_postpull_rcsum(struct sk_buff *skb,
if (skb->ip_summed == CHECKSUM_COMPLETE) if (skb->ip_summed == CHECKSUM_COMPLETE)
skb->csum = csum_sub(skb->csum, csum_partial(start, len, 0)); skb->csum = csum_sub(skb->csum, csum_partial(start, len, 0));
else if (skb->ip_summed == CHECKSUM_PARTIAL && else if (skb->ip_summed == CHECKSUM_PARTIAL &&
skb_checksum_start_offset(skb) <= len) skb_checksum_start_offset(skb) < 0)
skb->ip_summed = CHECKSUM_NONE; skb->ip_summed = CHECKSUM_NONE;
} }
......
...@@ -2869,11 +2869,12 @@ EXPORT_SYMBOL(skb_append_datato_frags); ...@@ -2869,11 +2869,12 @@ EXPORT_SYMBOL(skb_append_datato_frags);
*/ */
unsigned char *skb_pull_rcsum(struct sk_buff *skb, unsigned int len) unsigned char *skb_pull_rcsum(struct sk_buff *skb, unsigned int len)
{ {
unsigned char *data = skb->data;
BUG_ON(len > skb->len); BUG_ON(len > skb->len);
skb->len -= len; __skb_pull(skb, len);
BUG_ON(skb->len < skb->data_len); skb_postpull_rcsum(skb, data, len);
skb_postpull_rcsum(skb, skb->data, len); return skb->data;
return skb->data += len;
} }
EXPORT_SYMBOL_GPL(skb_pull_rcsum); EXPORT_SYMBOL_GPL(skb_pull_rcsum);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment