From nobody Sat Feb 7 07:33:43 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1726596040103640.6120468680346; Tue, 17 Sep 2024 11:00:40 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 0342B15FF; Tue, 17 Sep 2024 14:00:38 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 74C001ACF; Tue, 17 Sep 2024 13:59:43 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 3608114B2; Tue, 17 Sep 2024 13:59:39 -0400 (EDT) Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 5875B152B for ; Tue, 17 Sep 2024 13:59:38 -0400 (EDT) Received: by mail-ed1-f43.google.com with SMTP id 4fb4d7f45d1cf-5c413cf5de5so8402870a12.0 for ; Tue, 17 Sep 2024 10:59:38 -0700 (PDT) Received: from localhost.localdomain ([37.186.51.20]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c42bb89d44sm3968522a12.70.2024.09.17.10.59.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Sep 2024 10:59:35 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-1.6 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726595977; x=1727200777; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fsH0KdA4vCpWFOVKpTxVB6qHs0TK18z0juY4p7+qT5E=; b=kDU2LeH/jZJ2DU926mk8SB1cE8e+M0x2agDo4jJNXlRF65s8dvUD0r0Xaf4Z9nFqrX UpSEPpe2eWZZ9vCrn6H2WhsgYRySU/od38BT21qcw6YU+K08JpmjR6II96b6gEwTDv48 Gjt9vjNqZxV2iRPfIFWM49lYDv17ksSklACFljqlVCNZn+C67hd11AMWpta485sPH0tJ ODAsbGaduT770Y8oDrX6Spyu8HXCwlrpXIFseXL9v/gCzhs66lMG2RBLkEgg4l7LHeZP 2YxPGP9SXuCH02/Cxe/7NmAzj+rn3A6VnZEqAZSpRUX/k9RfliMzVLkLz7YQfEc+mhcu P2eQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726595977; x=1727200777; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fsH0KdA4vCpWFOVKpTxVB6qHs0TK18z0juY4p7+qT5E=; b=A0T053vkDIkEsuhV3xD+SZaA/FzxkuOal/xXB3cxg6XG9psMmOTarFP6v4RSTH0E1w B5hCcKzSEFLQW5D3D7yrAI7ovK5QripsDJDfEGFijj9zQSnKEze6Sczd90kx38B3lg0y UfioEwEW8YDQ6TQ0VeAL7rPnz0BQ8Y7KOm6dvVKHDU8awdAkmYGEdEhn5kE/FTF4aebZ plcnF2xsyOBUOpv4CfyVJBbR5gmZ4RXsOsn6ao6YyNklU/e6v3zMgRCrwIsZT1BalCet Mrn852HMg3zzcrgSOYInvPYR1joCNrP8yl/a8SsbXzkF7xSltZy6tszwUmNR7McygcbP 2N1A== X-Gm-Message-State: AOJu0YyLw7/K47gyVw5pL2KZk0sERSQl3dEUmbFBbDyEL3lNlkZfjQ01 SjYa2ggIyPVRxJrkweTsNLok62QGe+eZrzPsejKQEc06sCY0M97rlNid1gA1 X-Google-Smtp-Source: AGHT+IEcdtpSYTrzTrdHDl80i1ffnXO/dUfrDCKg87iCessBnUufXPbGjcCut3LVBcNZrCF96IlbiA== X-Received: by 2002:a05:6402:1f0e:b0:5be:fa43:8017 with SMTP id 4fb4d7f45d1cf-5c413e1eecbmr17327863a12.16.1726595976585; Tue, 17 Sep 2024 10:59:36 -0700 (PDT) From: Rayhan Faizel To: devel@lists.libvirt.org Subject: [PATCH 1/2] libxl_conf: Fix config generation for multiple serial devices Date: Tue, 17 Sep 2024 23:28:45 +0530 Message-Id: <20240917175846.1351068-2-rayhan.faizel@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240917175846.1351068-1-rayhan.faizel@gmail.com> References: <20240917175846.1351068-1-rayhan.faizel@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: WFPZOSTJ4XM7FTBTWJK6I66ZECWAH7QK X-Message-ID-Hash: WFPZOSTJ4XM7FTBTWJK6I66ZECWAH7QK X-MailFrom: rayhan.faizel@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Rayhan Faizel X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1726596041565116600 Content-Type: text/plain; charset="utf-8" Currently, an array of libxl_string_list (char **) or in other words, a triple char pointer is initialized. This is dereferenced to a char ** type and stored in serial_list, which is NULL at this point. There is an attempt= to reference an element of this serial_list when making a call to libxlMakeChrdevStr which causes a segmentation fault. To fix this, we simply allocate an array of char * instead of libxl_string_list. This patch also adds testcases to extend coverage over both single serial a= nd multiple serial cases. Signed-off-by: Rayhan Faizel Reviewed-by: Martin Kletzander --- src/libxl/libxl_conf.c | 2 +- .../multiple-serial.json | 63 +++++++++++++++++++ .../multiple-serial.xml | 47 ++++++++++++++ .../libxlxml2domconfigdata/single-serial.json | 52 +++++++++++++++ .../libxlxml2domconfigdata/single-serial.xml | 25 ++++++++ tests/libxlxml2domconfigtest.c | 3 + 6 files changed, 191 insertions(+), 1 deletion(-) create mode 100644 tests/libxlxml2domconfigdata/multiple-serial.json create mode 100644 tests/libxlxml2domconfigdata/multiple-serial.xml create mode 100644 tests/libxlxml2domconfigdata/single-serial.json create mode 100644 tests/libxlxml2domconfigdata/single-serial.xml diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 62e1be6672..8c91489ffd 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -692,7 +692,7 @@ libxlMakeDomBuildInfo(virDomainDef *def, 0) return -1; } else { - b_info->u.hvm.serial_list =3D *g_new0(libxl_string_list, d= ef->nserials + 1); + b_info->u.hvm.serial_list =3D g_new0(char *, def->nserials= + 1); for (i =3D 0; i < def->nserials; i++) { if (libxlMakeChrdevStr(def->serials[i], &b_info->u.hvm.serial_list[i]) = < 0) diff --git a/tests/libxlxml2domconfigdata/multiple-serial.json b/tests/libx= lxml2domconfigdata/multiple-serial.json new file mode 100644 index 0000000000..121f2d1260 --- /dev/null +++ b/tests/libxlxml2domconfigdata/multiple-serial.json @@ -0,0 +1,63 @@ +{ + "c_info": { + "type": "hvm", + "name": "test-hvm", + "uuid": "2147d599-9cc6-c0dc-92ab-4064b5446e9b" + }, + "b_info": { + "max_vcpus": 4, + "avail_vcpus": [ + 0, + 1, + 2, + 3 + ], + "max_memkb": 1048576, + "target_memkb": 1048576, + "shadow_memkb": 1234, + "sched_params": { + + }, + "acpi": "True", + "apic": "True", + "type.hvm": { + "pae": "True", + "nographic": "True", + "vga": { + "kind": "none" + }, + "vnc": { + "enable": "False" + }, + "sdl": { + "enable": "False" + }, + "spice": { + + }, + "serial_list": [ + "null", + "stdio", + "vc", + "pty", + "pipe:/tmp/file", + "file:/tmp/serial.log", + "/dev/ttyS2", + "udp::9999@:0", + "tcp:127.0.0.1:9999", + "unix:/tmp/serial-server.sock,server,nowait" + ], + "boot": "c", + "rdm": { + + } + }, + "arch_arm": { + + }, + "arch_x86": { + + } + }, + "on_reboot": "restart" +} diff --git a/tests/libxlxml2domconfigdata/multiple-serial.xml b/tests/libxl= xml2domconfigdata/multiple-serial.xml new file mode 100644 index 0000000000..c50ffd0bb4 --- /dev/null +++ b/tests/libxlxml2domconfigdata/multiple-serial.xml @@ -0,0 +1,47 @@ + + test-hvm + None + 2147d599-9cc6-c0dc-92ab-4064b5446e9b + 1048576 + 1048576 + 4 + destroy + restart + destroy + + + hvm + /usr/lib/xen/boot/hvmloader + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/libxlxml2domconfigdata/single-serial.json b/tests/libxlx= ml2domconfigdata/single-serial.json new file mode 100644 index 0000000000..a736e6f805 --- /dev/null +++ b/tests/libxlxml2domconfigdata/single-serial.json @@ -0,0 +1,52 @@ +{ + "c_info": { + "type": "hvm", + "name": "test-hvm", + "uuid": "2147d599-9cc6-c0dc-92ab-4064b5446e9b" + }, + "b_info": { + "max_vcpus": 4, + "avail_vcpus": [ + 0, + 1, + 2, + 3 + ], + "max_memkb": 1048576, + "target_memkb": 1048576, + "shadow_memkb": 1234, + "sched_params": { + + }, + "acpi": "True", + "apic": "True", + "type.hvm": { + "pae": "True", + "nographic": "True", + "vga": { + "kind": "none" + }, + "vnc": { + "enable": "False" + }, + "sdl": { + "enable": "False" + }, + "spice": { + + }, + "serial": "pty", + "boot": "c", + "rdm": { + + } + }, + "arch_arm": { + + }, + "arch_x86": { + + } + }, + "on_reboot": "restart" +} diff --git a/tests/libxlxml2domconfigdata/single-serial.xml b/tests/libxlxm= l2domconfigdata/single-serial.xml new file mode 100644 index 0000000000..f468024189 --- /dev/null +++ b/tests/libxlxml2domconfigdata/single-serial.xml @@ -0,0 +1,25 @@ + + test-hvm + None + 2147d599-9cc6-c0dc-92ab-4064b5446e9b + 1048576 + 1048576 + 4 + destroy + restart + destroy + + + hvm + /usr/lib/xen/boot/hvmloader + + + + + + + + + + + diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c index 21c4e7d149..255855b156 100644 --- a/tests/libxlxml2domconfigtest.c +++ b/tests/libxlxml2domconfigtest.c @@ -208,6 +208,9 @@ mymain(void) =20 DO_TEST("max-eventchannels-hvm"); =20 + DO_TEST("single-serial"); + DO_TEST("multiple-serial"); + unlink("libxl-driver.log"); =20 testXLFreeDriver(driver); --=20 2.34.1