From nobody Sun May 19 20:13:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1589169959; cv=none; d=zohomail.com; s=zohoarc; b=coHTcg6XUH5PeIytc3SRI368TG/5tiy0iufZ0qsTX4bmMPHVtxjMk7sPGkdMwrk2hfqtHi66tYqP/UsPNeL1uCnaOJfXqGWpymkLDVmbxWeqF5FDHMvNUG4ypwGKtduWSNM7kKq6OXStjMdwSrgnuOmhdYJ9/Z1k2R/u6p+Nsq0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589169959; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=fyFRwCc6QxaUaElcPQY1UK+XmfhSoaN7N7ZlRv46jlQ=; b=Os724F3z2OIFyzC0BLEFVqAdznzYk9NueTbpAFh4QBsc62P3LkZxh71Lf22jLfu8b/u9v3HYEvhaVqJUesRXepSrh43zaMHuxhamCWosCbQ1/N92RTf7O9ERbVMZerJzXMWLZvPpfQ5wrGg3/CqunlsA0h1Cp9F59cw0uyq0Y8Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1589169959762932.3304543092947; Sun, 10 May 2020 21:05:59 -0700 (PDT) Received: from localhost ([::1]:59826 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jXzhV-0003bC-JZ for importer@patchew.org; Mon, 11 May 2020 00:05:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48568) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jXzgp-0002ee-Lc for qemu-devel@nongnu.org; Mon, 11 May 2020 00:05:15 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:36012 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jXzgk-00031I-6o for qemu-devel@nongnu.org; Mon, 11 May 2020 00:05:13 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-340-4bZG_wYLOSmfaQOsQULkiQ-1; Mon, 11 May 2020 00:05:04 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6CE02461; Mon, 11 May 2020 04:05:03 +0000 (UTC) Received: from jason-ThinkPad-X1-Carbon-6th.redhat.com (ovpn-12-137.pek2.redhat.com [10.72.12.137]) by smtp.corp.redhat.com (Postfix) with ESMTP id 967E11001925; Mon, 11 May 2020 04:04:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589169906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fyFRwCc6QxaUaElcPQY1UK+XmfhSoaN7N7ZlRv46jlQ=; b=aaiz465dYtFt+LKybO21WsiX2hsqpjv3PdN5G0TGnNs2TywaoqGHfrQXAArQv50lBS9hAV Fw5NYcYzGORq2FGGgMirSqoWTnL5UHEMY1MVjvJwHsmNpbIZaKmwF8u4k2SJCw+GN8wWqY Jf74vTqScKyJ3p4xmEgCqhEqVIwBvQ8= X-MC-Unique: 4bZG_wYLOSmfaQOsQULkiQ-1 From: Jason Wang To: jasowang@redhat.com Subject: [PATCH] net: use peer when purging queue in qemu_flush_or_purge_queue_packets() Date: Mon, 11 May 2020 12:04:53 +0800 Message-Id: <20200511040453.23956-1-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.61; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/10 23:06:26 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alxndr@bu.edu, qemu-stable@nongnu.org, qemu-devel@nongnu.org, stefanha@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The sender of packet will be checked in the qemu_net_queue_purge() but we use NetClientState not its peer when trying to purge the incoming queue in qemu_flush_or_purge_packets(). This will trigger the assert in virtio_net_reset since we can't pass the sender check. Fix by using the peer. Reported-by: "Alexander Bulekov" Fixes: ca77d85e1dbf9 ("net: complete all queued packets on VM stop") Cc: qemu-stable@nongnu.org Signed-off-by: Jason Wang Acked-by: Alexander Bulekov --- net/net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/net.c b/net/net.c index 38778e831d..9e47cf727d 100644 --- a/net/net.c +++ b/net/net.c @@ -610,7 +610,7 @@ void qemu_flush_or_purge_queued_packets(NetClientState = *nc, bool purge) qemu_notify_event(); } else if (purge) { /* Unable to empty the queue, purge remaining packets */ - qemu_net_queue_purge(nc->incoming_queue, nc); + qemu_net_queue_purge(nc->incoming_queue, nc->peer); } } =20 --=20 2.20.1