diff options
| author | Jason Wang <jasowang@redhat.com> | 2012-05-02 11:41:58 +0800 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2012-05-02 18:22:19 +0300 |
| commit | 02ce04bb3d28c3333231f43bca677228dbc686fe (patch) | |
| tree | c550c85297c3c4f3e2f7e92e5f98226fefb3c259 | |
| parent | 4ef67ebedffa44ed9939b34708ac2fee06d2f65f (diff) | |
| download | linux-3.10-02ce04bb3d28c3333231f43bca677228dbc686fe.tar.gz linux-3.10-02ce04bb3d28c3333231f43bca677228dbc686fe.tar.bz2 linux-3.10-02ce04bb3d28c3333231f43bca677228dbc686fe.zip | |
macvtap: zerocopy: put page when fail to get all requested user pages
When get_user_pages_fast() fails to get all requested pages, we could not use
kfree_skb() to free it as it has not been put in the skb fragments. So we need
to call put_page() instead.
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | drivers/net/macvtap.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c index 7cb2684a879..9ab182a4064 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c @@ -531,9 +531,11 @@ static int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from, size = ((base & ~PAGE_MASK) + len + ~PAGE_MASK) >> PAGE_SHIFT; num_pages = get_user_pages_fast(base, size, 0, &page[i]); if ((num_pages != size) || - (num_pages > MAX_SKB_FRAGS - skb_shinfo(skb)->nr_frags)) - /* put_page is in skb free */ + (num_pages > MAX_SKB_FRAGS - skb_shinfo(skb)->nr_frags)) { + for (i = 0; i < num_pages; i++) + put_page(page[i]); return -EFAULT; + } truesize = size * PAGE_SIZE; skb->data_len += len; skb->len += len; |