From patchwork Tue Nov 25 14:43:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 414725 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3F7561401DC for ; Wed, 26 Nov 2014 01:44:50 +1100 (AEDT) Received: from localhost ([::1]:57746 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XtHMG-0000SS-6E for incoming@patchwork.ozlabs.org; Tue, 25 Nov 2014 09:44:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35461) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XtHLB-0007N0-Qa for qemu-devel@nongnu.org; Tue, 25 Nov 2014 09:43:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XtHL5-0004zy-To for qemu-devel@nongnu.org; Tue, 25 Nov 2014 09:43:41 -0500 Received: from smtp02.citrix.com ([66.165.176.63]:9063) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XtHL5-0004zS-QG for qemu-devel@nongnu.org; Tue, 25 Nov 2014 09:43:35 -0500 X-IronPort-AV: E=Sophos;i="5.07,455,1413244800"; d="scan'208";a="196571519" Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.79) with Microsoft SMTP Server id 14.3.181.6; Tue, 25 Nov 2014 09:43:34 -0500 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1XtHKy-0003UI-Mv; Tue, 25 Nov 2014 14:43:28 +0000 From: Stefano Stabellini To: Date: Tue, 25 Nov 2014 14:43:23 +0000 Message-ID: <1416926603-12397-4-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 X-DLP: MIA1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.63 Cc: xen-devel@lists.xensource.com, mst@redhat.com, jasowang@redhat.com, Stefano Stabellini , pbonzini@redhat.com Subject: [Qemu-devel] [PATCH 4/4] virtio-net: do not leak cpu mappings X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org In virtio_net_handle_ctrl unmap the previously mapped out_sg, not a subset of it. This patch fixes an abort() when running on Xen. Signed-off-by: Stefano Stabellini CC: jasowang@redhat.com CC: wency@cn.fujitsu.com CC: mst@redhat.com CC: pbonzini@redhat.com --- hw/net/virtio-net.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 5035313..c9b82f3 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -773,6 +773,7 @@ static void virtio_net_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq) VirtQueueElement elem; size_t s; struct iovec *iov; + struct iovec iov_copy[VIRTQUEUE_MAX_SIZE]; unsigned int iov_cnt; while (virtqueue_pop(vq, &elem)) { @@ -782,6 +783,7 @@ static void virtio_net_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq) exit(1); } + memcpy(iov_copy, elem.out_sg, elem.out_num*sizeof(struct iovec)); iov = elem.out_sg; iov_cnt = elem.out_num; s = iov_to_buf(iov, iov_cnt, 0, &ctrl, sizeof(ctrl)); @@ -804,7 +806,7 @@ static void virtio_net_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq) assert(s == sizeof(status)); virtqueue_unmap_sg(elem.in_sg, elem.in_num, 1, sizeof(status)); - virtqueue_unmap_sg(elem.out_sg, elem.out_num, 0, UINT_MAX); + virtqueue_unmap_sg(iov_copy, elem.out_num, 0, UINT_MAX); virtqueue_fill(vq, &elem, sizeof(status), 0); virtqueue_flush(vq, 1); virtio_notify(vdev, vq);