From: Jason Wang Date: Wed, 2 May 2012 03:41:58 +0000 (+0800) Subject: macvtap: zerocopy: put page when fail to get all requested user pages X-Git-Tag: v3.2.24~91 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e9214638ead441c15b48f40c3b459aede77c2662;p=karo-tx-linux.git macvtap: zerocopy: put page when fail to get all requested user pages commit 02ce04bb3d28c3333231f43bca677228dbc686fe upstream. 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 Signed-off-by: Michael S. Tsirkin Signed-off-by: Ben Hutchings --- diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c index c7a84eb75d1a..f217247c9b9c 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c @@ -530,9 +530,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;