3.4-stable review patch. If anyone has any objections, please let me know.
------------------ From: Jason Wang <[email protected]> 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 <[email protected]> Signed-off-by: Michael S. Tsirkin <[email protected]> Cc: Ben Hutchings <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- drivers/net/macvtap.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c @@ -533,9 +533,10 @@ static int zerocopy_sg_from_iovec(struct if (i + size > MAX_SKB_FRAGS) return -EMSGSIZE; num_pages = get_user_pages_fast(base, size, 0, &page[i]); - if (num_pages != size) - /* put_page is in skb free */ - return -EFAULT; + if (num_pages != size) { + for (i = 0; i < num_pages; i++) + put_page(page[i]); + } truesize = size * PAGE_SIZE; skb->data_len += len; skb->len += len; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
