Commit 4d0e59ac authored by Jens Freimann's avatar Jens Freimann Committed by Jason Wang
Browse files

net/virtio: return error when device_opts arg is NULL 



This fixes CID 1407222.

Fixes: 9711cd0d ("net/virtio: add failover support")
Signed-off-by: default avatarJens Freimann <jfreimann@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
parent 150ab54a

hw/net/virtio-net.c

+6 −3
Original line number Diff line number Diff line
@@ -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;