Merge branches 'pm-devfreq' and 'pm-cpufreq'

* pm-devfreq:
  PM / devfreq: fix double kfree
  PM / devfreq: Fix governor_store()

* pm-cpufreq:
  cpufreq: prevent lockup on reading scaling_available_frequencies
  cpufreq: acpi_cpufreq: prevent crash on reading freqdomain_cpus

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;
 }
 EXPORT_SYMBOL_GPL(skb_pull_rcsum);