From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752592Ab3FXDXd (ORCPT ); Sun, 23 Jun 2013 23:23:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48787 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752417Ab3FXDXZ (ORCPT ); Sun, 23 Jun 2013 23:23:25 -0400 Message-ID: <51C7BBA3.1050300@redhat.com> Date: Mon, 24 Jun 2013 11:23:15 +0800 From: Jason Wang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130510 Thunderbird/17.0.6 MIME-Version: 1.0 To: "Michael S. Tsirkin" CC: linux-kernel@vger.kernel.org, "David S. Miller" , Eric Dumazet , Andrew Morton , netdev@vger.kernel.org, Brad Hubbard Subject: Re: [PATCH net] macvtap: fix recovery from gup errors References: <20130623142658.GA21141@redhat.com> In-Reply-To: <20130623142658.GA21141@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 06/23/2013 10:26 PM, Michael S. Tsirkin wrote: > 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 > Signed-off-by: Michael S. Tsirkin > --- > > Same as the tun patch really. Also stable material. Acked-by: Jason Wang > > drivers/net/macvtap.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c > index 59e9605..4ddd108 100644 > --- a/drivers/net/macvtap.c > +++ b/drivers/net/macvtap.c > @@ -524,8 +524,9 @@ static int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from, > return -EMSGSIZE; > num_pages = get_user_pages_fast(base, size, 0, &page[i]); > if (num_pages != size) { > - for (i = 0; i < num_pages; i++) > - put_page(page[i]); > + int j; > + for (j = 0; j < num_pages; j++) > + put_page(page[i + j]); > return -EFAULT; > } > truesize = size * PAGE_SIZE;