From nobody Tue Feb 10 02:43:22 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=1557407294; cv=none; d=zoho.com; s=zohoarc; b=F9N+la8nDFQEbQNS8PQ0Ig8dzODzdp60E+19wXToG6oAwETvlY82RaI76h5XyAofdQazHON0BQYhHuJybl40gKfwpvsqCUdD2jHyr/E3KvqKqFm697vhC7fzKh/dTpVGvBssnQZ3Ma4ARYMK7bmvkcYZVW8Ci1U4PfWtdLcy4gY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557407294; 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=IdqWBXEXkoRWTNDm+MO2rwhUKDiaT6Qci9o49QOvFqE=; b=emBM+K0X2FdffrxqEgts7rFRoUol/GuSpyAC+s99yHos/jgkQ+1dUtuZ/7XryOmOJrDh1t0e7QEwdckv9Wf+TfVeL3AmtNs97jBZXjpDW5SWOfxSswgTQNowijVVLSx523cXmMx/7rwwrl0iez77tZ0BM//R4bfFCLFy7LLgffc= 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 1557407294008910.7024294744633; Thu, 9 May 2019 06:08:14 -0700 (PDT) Received: from localhost ([127.0.0.1]:54314 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOimO-0002e8-BU for importer@patchew.org; Thu, 09 May 2019 09:08:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43716) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOiii-0007j4-W9 for qemu-devel@nongnu.org; Thu, 09 May 2019 09:04:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOiih-0007hj-7M for qemu-devel@nongnu.org; Thu, 09 May 2019 09:04:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28752) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hOiig-0007Rv-W8 for qemu-devel@nongnu.org; Thu, 09 May 2019 09:04:19 -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 9FAE0306D329 for ; Thu, 9 May 2019 13:03:54 +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 5FF4460E37; Thu, 9 May 2019 13:03:53 +0000 (UTC) From: Stefano Garzarella To: qemu-devel@nongnu.org Date: Thu, 9 May 2019 15:03:43 +0200 Message-Id: <20190509130345.227526-3-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.47]); Thu, 09 May 2019 13:03:54 +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 2/4] net: avoid using variable length array in net_client_init() 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" net_client_init() uses a variable length array to store the prefix of 'ipv6-net' parameter (e.g. if ipv6-net=3Dfec0::0/64, the prefix is 'fec0::0'). This patch introduces g_strsplit() to split the 'ipv6-net' parameter, so we can remove the variable length array. Suggested-by: Markus Armbruster Signed-off-by: Stefano Garzarella Reviewed-by: Markus Armbruster --- net/net.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/net/net.c b/net/net.c index d5071e49e2..932fa5abb5 100644 --- a/net/net.c +++ b/net/net.c @@ -1118,29 +1118,38 @@ static int net_client_init(QemuOpts *opts, bool is_= netdev, Error **errp) const char *ip6_net =3D qemu_opt_get(opts, "ipv6-net"); =20 if (ip6_net) { - char buf[strlen(ip6_net) + 1]; + gchar **substrings; + char *prefix_addr; + unsigned long prefix_len =3D 64; /* Default 64bit prefix lengt= h. */ =20 - if (get_str_sep(buf, sizeof(buf), &ip6_net, '/') < 0) { - /* Default 64bit prefix length. */ - qemu_opt_set(opts, "ipv6-prefix", ip6_net, &error_abort); - qemu_opt_set_number(opts, "ipv6-prefixlen", 64, &error_abo= rt); - } else { + substrings =3D g_strsplit(ip6_net, "/", 2); + if (!substrings || !substrings[0]) { + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, + "ipv6-net", "a valid IPv6 prefix"); + g_strfreev(substrings); + goto out; + } + + *prefix_addr =3D substrings[0]; + + if (substrings[1]) { /* User-specified prefix length. */ - unsigned long len; int err; =20 - qemu_opt_set(opts, "ipv6-prefix", buf, &error_abort); - err =3D qemu_strtoul(ip6_net, NULL, 10, &len); - + err =3D qemu_strtoul(substrings[1], NULL, 10, &prefix_len); if (err) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "ipv6-prefixlen", "a number"); + g_strfreev(substrings); goto out; } - - qemu_opt_set_number(opts, "ipv6-prefixlen", len, &error_ab= ort); } + + qemu_opt_set(opts, "ipv6-prefix", prefix_addr, &error_abort); + qemu_opt_set_number(opts, "ipv6-prefixlen", prefix_len, + &error_abort); qemu_opt_unset(opts, "ipv6-net"); + g_strfreev(substrings); } } =20 --=20 2.20.1