From nobody Fri Apr 11 19:28:32 2025 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=1562040493; cv=none; d=zoho.com; s=zohoarc; b=IcYJIdXni14rB5F+EiGiDDDckxHyqdcLwVIYHfpB9dKmpXd+KsXqLRxFMRCaiZlybDve56+W9TK3kMrqlXP8bZpC9NpqHJrKZr8SKhCOiLy091WuM4bvGgqeINJkW9x6Qk1eD/7LtvId7sFEssi5uT65wchwIAitly4w/gCAcBs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562040493; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=st8i3Bs7dDUZ5EO0oq3xmIbK4QV3UY2KOu+YZrF4TDo=; b=NwUrhYk0OaRuK79UFlkGWrc4LcWDm+jOwj9WJv/m8rtITx5Xy1x8oHZb9xW33CU7BvrCTYmuXp/LVZHNdECIhNcaEFM1aEjYyDS1m/8lalSuUw+cn9Hnmi+ZDSNFL6uAOKBTJxL4kuRt7jW6Oj3Rkg+BL+bk002JX6UG8VQytbg= 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 1562040493930105.26403476343467; Mon, 1 Jul 2019 21:08:13 -0700 (PDT) Received: from localhost ([::1]:48460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hiA5R-0001Vi-Pm for importer@patchew.org; Tue, 02 Jul 2019 00:08:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50432) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hi8aH-0004mF-Ua for qemu-devel@nongnu.org; Mon, 01 Jul 2019 22:31:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hi8aG-0003e7-MM for qemu-devel@nongnu.org; Mon, 01 Jul 2019 22:31:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45792) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hi8aE-0003az-Pf for qemu-devel@nongnu.org; Mon, 01 Jul 2019 22:31:51 -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 AA1B1C0495A1; Tue, 2 Jul 2019 02:31:44 +0000 (UTC) Received: from jason-ThinkPad-T430s.redhat.com (ovpn-12-232.pek2.redhat.com [10.72.12.232]) by smtp.corp.redhat.com (Postfix) with ESMTP id 170E560C43; Tue, 2 Jul 2019 02:31:42 +0000 (UTC) From: Jason Wang To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Tue, 2 Jul 2019 10:31:17 +0800 Message-Id: <1562034689-6539-6-git-send-email-jasowang@redhat.com> In-Reply-To: <1562034689-6539-1-git-send-email-jasowang@redhat.com> References: <1562034689-6539-1-git-send-email-jasowang@redhat.com> 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.31]); Tue, 02 Jul 2019 02:31:44 +0000 (UTC) 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] [PULL 05/17] net: avoid using variable length array in net_client_init() 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 , Stefano Garzarella Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Stefano Garzarella 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 Signed-off-by: Jason Wang --- net/net.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/net/net.c b/net/net.c index d21c2c7..76ba0b7 100644 --- a/net/net.c +++ b/net/net.c @@ -1105,6 +1105,7 @@ static void show_netdevs(void) =20 static int net_client_init(QemuOpts *opts, bool is_netdev, Error **errp) { + gchar **substrings =3D NULL; void *object =3D NULL; Error *err =3D NULL; int ret =3D -1; @@ -1120,28 +1121,33 @@ 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]; + char *prefix_addr; + unsigned long prefix_len =3D 64; /* Default 64bit prefix lengt= h. */ + + substrings =3D g_strsplit(ip6_net, "/", 2); + if (!substrings || !substrings[0]) { + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "ipv6-net", + "a valid IPv6 prefix"); + goto out; + } =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 { + 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"); 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"); } } @@ -1164,6 +1170,7 @@ static int net_client_init(QemuOpts *opts, bool is_ne= tdev, Error **errp) =20 out: error_propagate(errp, err); + g_strfreev(substrings); visit_free(v); return ret; } --=20 2.5.0