mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

skbuff: skb_copy_ubufs must release uarg even without user frags

Browse source 
skb_copy_ubufs creates a private copy of frags[] to release its hold
on user frags, then calls uarg->callback to notify the owner.

Call uarg->callback even when no frags exist. This edge case can
happen when zerocopy_sg_from_iter finds enough room in skb_headlen
to copy all the data.

Fixes: 3ece782693 ("sock: skb_copy_ubufs support for compound pages")
Signed-off-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Willem de Bruijn 2017-12-20 17:37:50 -05:00 committed by David S. Miller
parent 268b790679
commit b90ddd5687
1 changed files with 2 additions and 1 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
net/core/skbuff.c
View file

@ -1178,7 +1178,7 @@ int skb_copy_ubufs(struct sk_buff *skb, gfp_t gfp_mask)
u32 d_off; u32 d_off;
if (!num_frags) if (!num_frags)
return 0; goto release;
if (skb_shared(skb) || skb_unclone(skb, gfp_mask)) if (skb_shared(skb) || skb_unclone(skb, gfp_mask))
return -EINVAL; return -EINVAL;
@ -1238,6 +1238,7 @@ int skb_copy_ubufs(struct sk_buff *skb, gfp_t gfp_mask)
__skb_fill_page_desc(skb, new_frags - 1, head, 0, d_off); __skb_fill_page_desc(skb, new_frags - 1, head, 0, d_off);
skb_shinfo(skb)->nr_frags = new_frags; skb_shinfo(skb)->nr_frags = new_frags;
release:
skb_zcopy_clear(skb, false); skb_zcopy_clear(skb, false);
return 0; return 0;
} }