Skip to content

Commit

Permalink
skbuff: skb_segment: orphan frags before copying
Browse files Browse the repository at this point in the history
commit 1fd819e upstream.

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 <mst@redhat.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
[bwh: Backported to 3.2.  As skb_segment() only supports page-frags *or* a
 frag list, there is no need for the additional frag_skb pointer or the
 preparatory renaming.]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
  • Loading branch information
Michael S. Tsirkin authored and Ben Hutchings committed Jul 11, 2014
1 parent 3ee479f commit 77c01a5
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions net/core/skbuff.c
Original file line number Diff line number Diff line change
Expand Up @@ -2698,6 +2698,9 @@ struct sk_buff *skb_segment(struct sk_buff *skb, u32 features)
skb_put(nskb, hsize), hsize);

while (pos < offset + len && i < nfrags) {
if (unlikely(skb_orphan_frags(skb, GFP_ATOMIC)))
goto err;

*frag = skb_shinfo(skb)->frags[i];
__skb_frag_ref(frag);
size = skb_frag_size(frag);
Expand Down

0 comments on commit 77c01a5

Please sign in to comment.