From nobody Tue Feb 10 01:31:33 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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=1557407196; cv=none; d=zoho.com; s=zohoarc; b=ULrJTjkyU6xrVNcfuI1Fnrhs2YFsbPY8fz//K01h6Qzp8RGU7Gu/w6ilZXpoTOQcJaJmsmoifzaKDA8myX6VshiBW70hWgVIdXEJIFDV5dqGh50o16KlDmNKmjcVVv7CNbiej+g8cOU3+8XG1hkQV7AHm9H5w3h8AzxaU54Lt3E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557407196; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=kz5O9CSav5yN/Zl2NrGwvhRmlc9tOzBBK++C4uQfIkU=; b=R2h7lEy6wL8MMdg8pUODmIkY/BdQ69qesfjqEydoM0bV2BedPMKr3+V8P92/rr/ykbuBw7p035WQkFDIHyZss9INeKa9YLhlejdZxmROJk/xZeQH/4UF1BM9fWphGzW4FBa0/1suLKTG24fGT4+6IyS93p8bVA6BjRyOFZjgo4M= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 1557407196711357.41205345348806; Thu, 9 May 2019 06:06:36 -0700 (PDT) Received: from localhost ([127.0.0.1]:54292 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOikk-0000wx-Lq for importer@patchew.org; Thu, 09 May 2019 09:06:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43704) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOiie-0007fd-Fs for qemu-devel@nongnu.org; Thu, 09 May 2019 09:04:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOiid-0007fM-Gt for qemu-devel@nongnu.org; Thu, 09 May 2019 09:04:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59016) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hOiid-0007M6-C0 for qemu-devel@nongnu.org; Thu, 09 May 2019 09:04:15 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0386C3079B66 for ; Thu, 9 May 2019 13:03:53 +0000 (UTC) Received: from steredhat.redhat.com (ovpn-116-227.ams2.redhat.com [10.36.116.227]) by smtp.corp.redhat.com (Postfix) with ESMTP id AC5DA60F8A; Thu, 9 May 2019 13:03:49 +0000 (UTC) From: Stefano Garzarella To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 15:03:42 +0200 Message-Id: <20190509130345.227526-2-sgarzare@redhat.com> In-Reply-To: <20190509130345.227526-1-sgarzare@redhat.com> References: <20190509130345.227526-1-sgarzare@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Thu, 09 May 2019 13:03:53 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 1/4] net: fix assertion failure when ipv6-prefixlen is not a number 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: Jason Wang , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" If 'ipv6-prefixlen' is not a number, the current behaviour produces an assertion failure: $ qemu-system-x86_64 -net user,ipv6-net=3Dfeca::0/a qemu-system-x86_64: qemu/util/qemu-option.c:1175: qemu_opts_foreach: Assertion `!errp || !*errp' failed. Aborted (core dumped) This patch fixes it, jumping to the end of the function when 'ipv6-prefixlen' is not a number, and printing the more friendly message: $ qemu-system-x86_64 -net user,ipv6-net=3Dfeca::0/a qemu-system-x86_64: Parameter 'ipv6-prefixlen' expects a number Signed-off-by: Stefano Garzarella Reviewed-by: Markus Armbruster --- net/net.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/net/net.c b/net/net.c index f3a3c5444c..d5071e49e2 100644 --- a/net/net.c +++ b/net/net.c @@ -1134,11 +1134,11 @@ static int net_client_init(QemuOpts *opts, bool is_= netdev, Error **errp) =20 if (err) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, - "ipv6-prefix", "a number"); - } else { - qemu_opt_set_number(opts, "ipv6-prefixlen", len, - &error_abort); + "ipv6-prefixlen", "a number"); + goto out; } + + qemu_opt_set_number(opts, "ipv6-prefixlen", len, &error_ab= ort); } qemu_opt_unset(opts, "ipv6-net"); } @@ -1160,6 +1160,7 @@ static int net_client_init(QemuOpts *opts, bool is_ne= tdev, Error **errp) qapi_free_NetLegacy(object); } =20 +out: error_propagate(errp, err); visit_free(v); return ret; --=20 2.20.1