2 files changed, 32 insertions, 5 deletions

diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
index 40b71a29fc3f..42eea5fe2628 100644
--- a/net/9p/trans_virtio.c
+++ b/net/9p/trans_virtio.c
@@ -199,14 +199,12 @@ static void p9_virtio_close(struct p9_trans *trans)
         kfree(trans);
 }
 
-static bool p9_virtio_intr(struct virtqueue *q)
+static void p9_virtio_intr(struct virtqueue *q)
 {
         struct virtio_chan *chan = q->vdev->priv;
 
         P9_DPRINTK(P9_DEBUG_TRANS, "9p poll_wakeup: %p\n", &chan->wq);
         wake_up_interruptible(&chan->wq);
-
-        return true;
 }
 
 static int p9_virtio_probe(struct virtio_device *dev)
@@ -236,13 +234,13 @@ static int p9_virtio_probe(struct virtio_device *dev)
 
         /* Find the input queue. */
         dev->priv = chan;
-        chan->in_vq = dev->config->find_vq(dev, p9_virtio_intr);
+        chan->in_vq = dev->config->find_vq(dev, 0, p9_virtio_intr);
         if (IS_ERR(chan->in_vq)) {
                 err = PTR_ERR(chan->in_vq);
                 goto free;
         }
 
-        chan->out_vq = dev->config->find_vq(dev, NULL);
+        chan->out_vq = dev->config->find_vq(dev, 1, NULL);
         if (IS_ERR(chan->out_vq)) {
                 err = PTR_ERR(chan->out_vq);
                 goto free_in_vq;
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 98420f9c4b6d..4e354221ec23 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -2461,6 +2461,34 @@ int skb_cow_data(struct sk_buff *skb, int tailbits, struct sk_buff **trailer)
         return elt;
 }
 
+/**
+ * skb_partial_csum_set - set up and verify partial csum values for packet
+ * @skb: the skb to set
+ * @start: the number of bytes after skb->data to start checksumming.
+ * @off: the offset from start to place the checksum.
+ *
+ * For untrusted partially-checksummed packets, we need to make sure the values
+ * for skb->csum_start and skb->csum_offset are valid so we don't oops.
+ *
+ * This function checks and sets those values and skb->ip_summed: if this
+ * returns false you should drop the packet.
+ */
+bool skb_partial_csum_set(struct sk_buff *skb, u16 start, u16 off)
+{
+        if (unlikely(start > skb->len - 2) ||
+            unlikely((int)start + off > skb->len - 2)) {
+                if (net_ratelimit())
+                        printk(KERN_WARNING
+                               "bad partial csum: csum=%u/%u len=%u\n",
+                               start, off, skb->len);
+                return false;
+        }
+        skb->ip_summed = CHECKSUM_PARTIAL;
+        skb->csum_start = skb_headroom(skb) + start;
+        skb->csum_offset = off;
+        return true;
+}
+
 EXPORT_SYMBOL(___pskb_trim);
 EXPORT_SYMBOL(__kfree_skb);
 EXPORT_SYMBOL(kfree_skb);
@@ -2497,3 +2525,4 @@ EXPORT_SYMBOL(skb_append_datato_frags);
 
 EXPORT_SYMBOL_GPL(skb_to_sgvec);
 EXPORT_SYMBOL_GPL(skb_cow_data);
+EXPORT_SYMBOL_GPL(skb_partial_csum_set);