{"id":806829,"url":"http://patchwork.ozlabs.org/api/1.0/patches/806829/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<1503965694-10794-38-git-send-email-mdroth@linux.vnet.ibm.com>","date":"2017-08-29T00:14:12","name":"[37/79] virtio-net: fix wild pointer when remove virtio-net queues","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"91ee446f1bf4735758a9927951aac18be69918e8","submitter":{"id":5549,"url":"http://patchwork.ozlabs.org/api/1.0/people/5549/?format=json","name":"Michael Roth","email":"mdroth@linux.vnet.ibm.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1503965694-10794-38-git-send-email-mdroth@linux.vnet.ibm.com/mbox/","series":[{"id":281,"url":"http://patchwork.ozlabs.org/api/1.0/series/281/?format=json","date":"2017-08-29T00:13:45","name":"Patch Round-up for stable 2.9.1, freeze on 2017-09-04","version":1,"mbox":"http://patchwork.ozlabs.org/series/281/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/806829/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xh8hY47LQz9sNc\n\tfor ;\n\tTue, 29 Aug 2017 10:31:41 +1000 (AEST)","from localhost ([::1]:41969 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dmURP-0006ls-Cj\n\tfor incoming@patchwork.ozlabs.org; Mon, 28 Aug 2017 20:31:39 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:47982)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dmUCR-0001F7-9e\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:14 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dmUCO-0005Qp-4O\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:11 -0400","from mx0b-001b2d01.pphosted.com ([148.163.158.5]:34164\n\thelo=mx0a-001b2d01.pphosted.com)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dmUCN-0005QP-Vr\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:08 -0400","from pps.filterd (m0098413.ppops.net [127.0.0.1])\n\tby mx0b-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv7T0E7iZ017707\n\tfor ; Mon, 28 Aug 2017 20:16:07 -0400","from e31.co.us.ibm.com (e31.co.us.ibm.com [32.97.110.149])\n\tby mx0b-001b2d01.pphosted.com with ESMTP id 2cmub2wvrt-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor ; Mon, 28 Aug 2017 20:16:07 -0400","from localhost\n\tby e31.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor from ;\n\tMon, 28 Aug 2017 18:16:06 -0600","from b03cxnp08028.gho.boulder.ibm.com (9.17.130.20)\n\tby e31.co.us.ibm.com (192.168.1.131) with IBM ESMTP SMTP Gateway:\n\tAuthorized Use Only! Violators will be prosecuted; \n\tMon, 28 Aug 2017 18:16:04 -0600","from b03ledav004.gho.boulder.ibm.com\n\t(b03ledav004.gho.boulder.ibm.com [9.17.130.235])\n\tby b03cxnp08028.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with\n\tESMTP id v7T0G4Po30998654; Mon, 28 Aug 2017 17:16:04 -0700","from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 0367F78043;\n\tMon, 28 Aug 2017 18:16:04 -0600 (MDT)","from localhost (unknown [9.80.85.217])\n\tby b03ledav004.gho.boulder.ibm.com (Postfix) with ESMTP id C76677804D;\n\tMon, 28 Aug 2017 18:16:03 -0600 (MDT)"],"From":"Michael Roth ","To":"qemu-devel@nongnu.org","Date":"Mon, 28 Aug 2017 19:14:12 -0500","X-Mailer":"git-send-email 2.7.4","In-Reply-To":"<1503965694-10794-1-git-send-email-mdroth@linux.vnet.ibm.com>","References":"<1503965694-10794-1-git-send-email-mdroth@linux.vnet.ibm.com>","X-TM-AS-GCONF":"00","x-cbid":"17082900-8235-0000-0000-00000C2FE7AB","X-IBM-SpamModules-Scores":"","X-IBM-SpamModules-Versions":"BY=3.00007630; HX=3.00000241; KW=3.00000007;\n\tPH=3.00000004; SC=3.00000226; SDB=6.00909028; UDB=6.00455849;\n\tIPR=6.00689279; \n\tBA=6.00005557; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009;\n\tZB=6.00000000; \n\tZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00016909;\n\tXFM=3.00000015; UTC=2017-08-29 00:16:06","X-IBM-AV-DETECTION":"SAVI=unused REMOTE=unused XFE=unused","x-cbparentid":"17082900-8236-0000-0000-00003D6C06F9","Message-Id":"<1503965694-10794-38-git-send-email-mdroth@linux.vnet.ibm.com>","X-Proofpoint-Virus-Version":"vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-08-28_13:, , signatures=0","X-Proofpoint-Spam-Details":"rule=outbound_notspam policy=outbound score=0\n\tspamscore=0 suspectscore=3\n\tmalwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam\n\tadjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000\n\tdefinitions=main-1708290001","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy]","X-Received-From":"148.163.158.5","Subject":"[Qemu-devel] [PATCH 37/79] virtio-net: fix wild pointer when remove\n\tvirtio-net queues","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Jason Wang , Yunjian Wang , \n\tqemu-stable@nongnu.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Yunjian Wang \n\nThe tx_bh or tx_timer will free in virtio_net_del_queue() function, when\nremoving virtio-net queues if the guest doesn't support multiqueue. But\nit might be still referenced by virtio_net_set_status(), which needs to\nbe set NULL. And also the tx_waiting needs to be set zero to prevent\nvirtio_net_set_status() accessing tx_bh or tx_timer.\n\nCc: qemu-stable@nongnu.org\nSigned-off-by: Yunjian Wang \nSigned-off-by: Jason Wang \n(cherry picked from commit f989c30cf834ba8625e98b808eac30e4e7ec5008)\nSigned-off-by: Michael Roth \n---\n hw/net/virtio-net.c | 3 +++\n 1 file changed, 3 insertions(+)","diff":"diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c\nindex 7d091c9..98bd683 100644\n--- a/hw/net/virtio-net.c\n+++ b/hw/net/virtio-net.c\n@@ -1522,9 +1522,12 @@ static void virtio_net_del_queue(VirtIONet *n, int index)\n if (q->tx_timer) {\n timer_del(q->tx_timer);\n timer_free(q->tx_timer);\n+ q->tx_timer = NULL;\n } else {\n qemu_bh_delete(q->tx_bh);\n+ q->tx_bh = NULL;\n }\n+ q->tx_waiting = 0;\n virtio_del_queue(vdev, index * 2 + 1);\n }\n \n","prefixes":["37/79"]}