From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:52926)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1Xu0c0-00065l-En
	for qemu-devel@nongnu.org; Thu, 27 Nov 2014 10:04:08 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1Xu0bw-0002EO-JV
	for qemu-devel@nongnu.org; Thu, 27 Nov 2014 10:04:04 -0500
Date: Thu, 27 Nov 2014 17:03:39 +0200
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20141127150339.GA26331@redhat.com>
References: <1417082643-23907-1-git-send-email-jasowang@redhat.com>
	<20141127123341.GC13476@redhat.com>
	<CAFEAcA-6rjp4rtQFHcKR_AMPSkmmCYNS2_4AmRUow7ZJcCuvTw@mail.gmail.com>
	<CAFEAcA_QU=+UND=0UKCzVAaDBQk+e9m6Cf0AqvzdJmEsDLgvnw@mail.gmail.com>
	<alpine.DEB.2.02.1411271450340.14135@kaball.uk.xensource.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <alpine.DEB.2.02.1411271450340.14135@kaball.uk.xensource.com>
Subject: Re: [Qemu-devel] [2.2 PATCH V2] virtio-net: fix unmap leak
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Peter Maydell <peter.maydell@linaro.org>, Fam Zheng <famz@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>, Jason Wang <jasowang@redhat.com>, QEMU Developers <qemu-devel@nongnu.org>, qemu-stable <qemu-stable@nongnu.org>, Anthony Liguori <aliguori@amazon.com>

On Thu, Nov 27, 2014 at 02:54:47PM +0000, Stefano Stabellini wrote:
> On Thu, 27 Nov 2014, Peter Maydell wrote:
> > On 27 November 2014 at 12:42, Peter Maydell <peter.maydell@linaro.org> wrote:
> > > On 27 November 2014 at 12:33, Michael S. Tsirkin <mst@redhat.com> wrote:
> > >> On Thu, Nov 27, 2014 at 06:04:03PM +0800, Jason Wang wrote:
> > >>> virtio_net_handle_ctrl() and other functions that process control vq
> > >>> request call iov_discard_front() which will shorten the iov. This will
> > >>> lead unmapping in virtqueue_push() leaks mapping.
> > >>>
> > >>> Fixes this by keeping the original iov untouched and using a temp variable
> > >>> in those functions.
> > >>>
> > >>> Cc: Wen Congyang <wency@cn.fujitsu.com>
> > >>> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> > >>> Cc: qemu-stable@nongnu.org
> > >>> Signed-off-by: Jason Wang <jasowang@redhat.com>
> > >>
> > >> Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
> > >>
> > >> Peter, can you pick this up or do you want a pull request?
> > >
> > > I can pick it up. I was waiting a bit to check that everybody
> > > was happy that this is the correct way to fix the bug and the
> > > patch is ok...
> > 
> > ...but discussing this with Stefan H on IRC we realised that the same
> > issue also (at least potentially) affects virtio-blk, which suggests
> > that we should fix this by making the core virtio code cope with
> > backends which modify the sglists.
> 
> I think that a similar patch could be produced against
> hw/block/virtio-blk.c:virtio_blk_handle_request

Hmm, this is a data path operation. Adding malloc/free calls
there will slow things down measureably.

> Alternatively my series would help by introducing virtqueue_unmap_sg and
> moving it out of virtqueue_fill. We could call virtqueue_unmap_sg from
> the drivers (instead of calling it from virtqueue_push) and that would
> solve the issue.