macvtap: fix recovery from gup errors

get user pages might fail partially in macvtap zero copy
mode. To recover we need to put all pages that we got,
but code used a wrong index resulting in double-free
errors.

Reported-by: Brad Hubbard <bhubbard@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Michael S. Tsirkin 2013-06-23 17:26:58 +03:00 committed by David S. Miller
parent 7e24bfbe43
commit 4c7ab054ab

View File

@ -524,8 +524,10 @@ static int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from,
return -EMSGSIZE; return -EMSGSIZE;
num_pages = get_user_pages_fast(base, size, 0, &page[i]); num_pages = get_user_pages_fast(base, size, 0, &page[i]);
if (num_pages != size) { if (num_pages != size) {
for (i = 0; i < num_pages; i++) int j;
put_page(page[i]);
for (j = 0; j < num_pages; j++)
put_page(page[i + j]);
return -EFAULT; return -EFAULT;
} }
truesize = size * PAGE_SIZE; truesize = size * PAGE_SIZE;