From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51071) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYq35-0001DA-2r for qemu-devel@nongnu.org; Fri, 20 Mar 2015 02:04:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YYq31-00080t-3f for qemu-devel@nongnu.org; Fri, 20 Mar 2015 02:04:47 -0400 Date: Fri, 20 Mar 2015 14:04:23 +0800 From: Jason Wang Message-Id: <1426831463.5879.7@smtp.corp.redhat.com> In-Reply-To: <1426830784.5879.5@smtp.corp.redhat.com> References: <1426748752-13385-1-git-send-email-jasowang@redhat.com> <1426748752-13385-2-git-send-email-jasowang@redhat.com> <20150319111013-mutt-send-email-mst@redhat.com> <1426830784.5879.5@smtp.corp.redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Subject: Re: [Qemu-devel] [PATCH for 2.3 2/2] virtio-net: fix the upper bound when trying to delete queues List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: qemu-devel@nongnu.org, qemu-stable On Fri, Mar 20, 2015 at 1:53 PM, Jason Wang wrote: > > > On Thu, Mar 19, 2015 at 6:12 PM, Michael S. Tsirkin > wrote: >> On Thu, Mar 19, 2015 at 03:05:52PM +0800, Jason Wang wrote: >>> Virtqueue were indexed from zero, so don't delete virtqueue whose >>> index is n->max_queues * 2 + 1. >> >> But what's the current behaviour? >> >> Can it lead to aborts? virtio_del_queue does: >> if (n < 0 || n >= VIRTIO_PCI_QUEUE_MAX) { >> abort(); >> } > > Yes, it will hit abort() above. With patch 1/1 on top, there will be no crash. Will drop this from V2. This patch was only needed for more virtio queues series. > >> >> >> >>> Cc: Michael S. Tsirkin >>> Cc: qemu-stable >>> Signed-off-by: Jason Wang >>> --- >>> hw/net/virtio-net.c | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c >>> index 59f76bc..b6fac9c 100644 >>> --- a/hw/net/virtio-net.c >>> +++ b/hw/net/virtio-net.c >>> @@ -1309,7 +1309,7 @@ static void >>> virtio_net_set_multiqueue(VirtIONet *n, int multiqueue) >>> n->multiqueue = multiqueue; >>> - for (i = 2; i <= n->max_queues * 2 + 1; i++) { >>> + for (i = 2; i < n->max_queues * 2 + 1; i++) { >>> virtio_del_queue(vdev, i); >>> } >>> -- 2.1.0 >> >