From nobody Fri May 3 09:12:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1528696669950637.813281750294; Sun, 10 Jun 2018 22:57:49 -0700 (PDT) Received: from localhost ([::1]:46634 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSFpf-0001u2-52 for importer@patchew.org; Mon, 11 Jun 2018 01:57:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34957) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSFok-0001Ym-Sd for qemu-devel@nongnu.org; Mon, 11 Jun 2018 01:56:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fSFoh-00074K-Si for qemu-devel@nongnu.org; Mon, 11 Jun 2018 01:56:38 -0400 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]:36085) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fSFoh-00073l-Mp for qemu-devel@nongnu.org; Mon, 11 Jun 2018 01:56:35 -0400 Received: by mail-pg0-x241.google.com with SMTP id m5-v6so9207766pgd.3 for ; Sun, 10 Jun 2018 22:56:35 -0700 (PDT) Received: from localhost.localdomain ([45.122.156.254]) by smtp.gmail.com with ESMTPSA id z3-v6sm16772487pfn.36.2018.06.10.22.56.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Jun 2018 22:56:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=bHNApQZkMmhH1GOEFnB8YrHUDwWnqVeutfISkCcr6os=; b=dWUnLwKLCDil7ymipkrOdt0iPcPgop5OXQhIuCX1rdz2ZpJlFxH/0BOhPdu5f/g13x HUuBRX0XiyAoaUZ6tEidO4knv+4CdJmEeVYkPy9hbZ6LF/1UGX4c/iEFE58qen9ROToj jjqxEpLlMnGff1QIgbdlmqN81Dz03DsMRa0y2fxvEh/+zJoeK99Rr9wXrcJm+NdtOSCp Kd+OcuTJu+pz/1YIoYOgKGw0ixChdw5rsk+SA8TKhiMnGCZuSkTbP8QR++3uJPDOMQlt dSkHVSY6qQoajkycfLjJAOv/97q80hNpmRr6r7oFDsLfaR7CzOKnDTuSGrWD1BGUHwuu DawA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=bHNApQZkMmhH1GOEFnB8YrHUDwWnqVeutfISkCcr6os=; b=D2ae2YhXCX072/vkkWBdga/LYgfluia5rRpzMTItnSVLFlQiEj1KdEZUqHwZ7KtxS/ 2niKruuHz9pBbVlRbzjyHLH7ng0b1YFqDO+ykzt3CKZzpiiNtHUMsTamaf73ChpBHRQR B3G4yPjH3pBjK179mUDd0JAzro21sNvP6rS1zk9z4bIWOMtuMF3ryhCqBqIfBYASeVrc qmGp62rYXj0W4ntMM8dref8/kNCk62VDLhfBi18Go9OShgzNTIkuYu1UWWVwQz6UmyBs cKxj1nVvTwqAlizsJfVH8b3T0DGen9Lw2ijefi6hd3y5dnhgBpE56wqMit4ri77WwSeU 9tLw== X-Gm-Message-State: APt69E0RsI+whv2jleEO15YBs7uc+XhLDQdnHsRY/kbyS5dWANgusWBI rzR4G1bFeCjCFQsmEW4lsMuH7w== X-Google-Smtp-Source: ADUXVKKioPWrt8O3KdbzEU9cRdp8ImAHH9AkcTEOu+SEerGcrUdTLOCCDcIFGNXOLtycKEeTmqipEw== X-Received: by 2002:a63:9e0a:: with SMTP id s10-v6mr13810228pgd.305.1528696594093; Sun, 10 Jun 2018 22:56:34 -0700 (PDT) From: Lin Ma To: qemu-devel@nongnu.org Date: Mon, 11 Jun 2018 13:53:52 +0800 Message-Id: <20180611055352.8097-1-lma@suse.com> X-Mailer: git-send-email 2.15.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::241 Subject: [Qemu-devel] [PATCH] net: Fix a potential segfault X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jasowang@redhat.com, thuth@redhat.com, Lin Ma Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Lin Ma --- net/net.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/net/net.c b/net/net.c index efb9eaf779..f89790be4a 100644 --- a/net/net.c +++ b/net/net.c @@ -1093,9 +1093,12 @@ static int net_client_init(QemuOpts *opts, bool is_n= etdev, Error **errp) int ret =3D -1; Visitor *v =3D opts_visitor_new(opts); =20 - if (is_netdev && is_help_option(qemu_opt_get(opts, "type"))) { - show_netdevs(); - exit(0); + if (is_netdev) { + const char *type =3D qemu_opt_get(opts, "type"); + if (type && is_help_option(type)) { + show_netdevs(); + exit(0); + } } else { /* Parse convenience option format ip6-net=3Dfec0::0[/64] */ const char *ip6_net =3D qemu_opt_get(opts, "ipv6-net"); --=20 2.16.2