This is a note to let you know that I've just added the patch titled
skbuff: skb_segment: orphan frags before copying
to the 3.13-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
skbuff-skb_segment-orphan-frags-before-copying.patch
and it can be found in the queue-3.13 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From foo@baz Thu Apr 10 22:03:04 PDT 2014
From: "Michael S. Tsirkin" <[email protected]>
Date: Mon, 10 Mar 2014 19:28:08 +0200
Subject: skbuff: skb_segment: orphan frags before copying
From: "Michael S. Tsirkin" <[email protected]>
[ Upstream commit 1fd819ecb90cc9b822cd84d3056ddba315d3340f ]
skb_segment copies frags around, so we need
to copy them carefully to avoid accessing
user memory after reporting completion to userspace
through a callback.
skb_segment doesn't normally happen on datapath:
TSO needs to be disabled - so disabling zero copy
in this case does not look like a big deal.
Signed-off-by: Michael S. Tsirkin <[email protected]>
Acked-by: Herbert Xu <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
net/core/skbuff.c | 6 ++++++
1 file changed, 6 insertions(+)
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -2772,6 +2772,7 @@ struct sk_buff *skb_segment(struct sk_bu
skb_frag_t *frag = skb_shinfo(head_skb)->frags;
unsigned int mss = skb_shinfo(head_skb)->gso_size;
unsigned int doffset = head_skb->data - skb_mac_header(head_skb);
+ struct sk_buff *frag_skb = head_skb;
unsigned int offset = doffset;
unsigned int tnl_hlen = skb_tnl_header_len(head_skb);
unsigned int headroom;
@@ -2816,6 +2817,7 @@ struct sk_buff *skb_segment(struct sk_bu
i = 0;
nfrags = skb_shinfo(list_skb)->nr_frags;
frag = skb_shinfo(list_skb)->frags;
+ frag_skb = list_skb;
pos += skb_headlen(list_skb);
while (pos < offset + len) {
@@ -2903,6 +2905,7 @@ struct sk_buff *skb_segment(struct sk_bu
i = 0;
nfrags = skb_shinfo(list_skb)->nr_frags;
frag = skb_shinfo(list_skb)->frags;
+ frag_skb = list_skb;
BUG_ON(!nfrags);
@@ -2917,6 +2920,9 @@ struct sk_buff *skb_segment(struct sk_bu
goto err;
}
+ if (unlikely(skb_orphan_frags(frag_skb, GFP_ATOMIC)))
+ goto err;
+
*nskb_frag = *frag;
__skb_frag_ref(nskb_frag);
size = skb_frag_size(nskb_frag);
Patches currently in stable-queue which might be from [email protected] are
queue-3.13/virtio-net-correct-error-handling-of-virtqueue_kick.patch
queue-3.13/skbuff-skb_segment-orphan-frags-before-copying.patch
queue-3.13/vhost-fix-total-length-when-packets-are-too-short.patch
queue-3.13/skbuff-skb_segment-s-frag-nskb_frag.patch
queue-3.13/skbuff-skb_segment-s-skb-head_skb.patch
queue-3.13/vhost-validate-vhost_get_vq_desc-return-value.patch
queue-3.13/skbuff-skb_segment-s-skb_frag-frag.patch
queue-3.13/skbuff-skb_segment-s-fskb-list_skb.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
