From patchwork Mon Nov 25 15:40:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 1200474 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="gpwSqLpL"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47MBN26Rzjz9sPJ for ; Tue, 26 Nov 2019 02:51:14 +1100 (AEDT) Received: from localhost ([::1]:45644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZGds-0001lg-Df for incoming@patchwork.ozlabs.org; Mon, 25 Nov 2019 10:51:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33960) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZGTS-0000ED-B6 for qemu-devel@nongnu.org; Mon, 25 Nov 2019 10:40:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iZGTR-0002U7-7C for qemu-devel@nongnu.org; Mon, 25 Nov 2019 10:40:26 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:56577 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iZGTR-0002Sg-2l for qemu-devel@nongnu.org; Mon, 25 Nov 2019 10:40:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574696424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sY61yhknOowK74+/u3ndk4J62lzQKRsHnDv4mPDXX3w=; b=gpwSqLpL0RquMw+x8z6CbG/RJcGdCt3Ze6zKcBa0wjv31eVZ6euLJYa0C2Z0ylwbLNmykP xqM4HW1M1YWNNC6wk+qWfP4hCq9RHju+gtkHST1tKzm0v0QpRU+YdcItDYFYAfsblImzoG vlIMGlGm2OQdi5x6Vxw/hMN+pTSZ9yw= 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-286-JDcknIFhOZCvvr7aBLAggg-1; Mon, 25 Nov 2019 10:40:22 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0B322104ED3F; Mon, 25 Nov 2019 15:40:22 +0000 (UTC) Received: from jason-ThinkPad-T430s.redhat.com (ovpn-12-31.pek2.redhat.com [10.72.12.31]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5E4F15D9CA; Mon, 25 Nov 2019 15:40:20 +0000 (UTC) From: Jason Wang To: peter.maydell@linaro.org Subject: [PULL 4/4] net/virtio: return error when device_opts arg is NULL Date: Mon, 25 Nov 2019 23:40:07 +0800 Message-Id: <1574696407-4188-5-git-send-email-jasowang@redhat.com> In-Reply-To: <1574696407-4188-1-git-send-email-jasowang@redhat.com> References: <1574696407-4188-1-git-send-email-jasowang@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: JDcknIFhOZCvvr7aBLAggg-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 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: Jason Wang , Jens Freimann , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Jens Freimann This fixes CID 1407222. Fixes: 9711cd0dfc3f ("net/virtio: add failover support") Signed-off-by: Jens Freimann Reviewed-by: Michael S. Tsirkin Signed-off-by: Jason Wang --- hw/net/virtio-net.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 565dea0..3c31471 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -2880,9 +2880,12 @@ static int virtio_net_primary_should_be_hidden(DeviceListener *listener, QemuOpts *device_opts) { VirtIONet *n = container_of(listener, VirtIONet, primary_listener); - bool match_found; - bool hide; + bool match_found = false; + bool hide = false; + if (!device_opts) { + return -1; + } n->primary_device_dict = qemu_opts_to_qdict(device_opts, n->primary_device_dict); if (n->primary_device_dict) { @@ -2890,7 +2893,7 @@ static int virtio_net_primary_should_be_hidden(DeviceListener *listener, n->standby_id = g_strdup(qdict_get_try_str(n->primary_device_dict, "failover_pair_id")); } - if (device_opts && g_strcmp0(n->standby_id, n->netclient_name) == 0) { + if (g_strcmp0(n->standby_id, n->netclient_name) == 0) { match_found = true; } else { match_found = false;