From nobody Fri Oct 18 06:13:40 2024 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 1717684759999501.64486162665; Thu, 6 Jun 2024 07:39:19 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 95D272450; Thu, 6 Jun 2024 10:39:18 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id F40C7240B; Thu, 6 Jun 2024 10:38:19 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 24EB9232A; Thu, 6 Jun 2024 10:38:17 -0400 (EDT) Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) (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 564B32407 for ; Thu, 6 Jun 2024 10:38:15 -0400 (EDT) Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-2c21fbfb4a3so892085a91.2 for ; Thu, 06 Jun 2024 07:38:15 -0700 (PDT) Received: from localhost.localdomain ([49.47.195.6]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2c29c240e5csm1708337a91.31.2024.06.06.07.38.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jun 2024 07:38:13 -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=-0.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_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE 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=1717684694; x=1718289494; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=jW0ybh92GQWvnkxBFq9ycGX1GZRtJXWcxHgBmZYvRGM=; b=VlMdeQi2fCgBdeaeZVRy58xP6CAu0dlDuBtG+PyxMBtZWfPP2HFPQxzP40P1U8m1MF i3tYjbz6t24jJhk15/Ur10cJ04fH1laOx2FOP0/w4d0HgF+UKrfM5YOpV/SVR9+CkAaW AgKqw9BnWctRjbdMWj6mt9YdRVMPRvUw8tWKuCq1pmQZYNYxxUZO+1ejvZKpwW0ljdHI R37rv8VRSQdmhb1AT9OKXlA57b0YdBzkUBIQSmlE2VrZWVu5dBkpRLcuFMJ7a7orrmOe RSQvHWAgSkWD23Ui4oe+jZXbpJuYe7bEG/AAEFpUIBiYmNelwcpd7sXR1r+U4W+hV27t 0/sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717684694; x=1718289494; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=jW0ybh92GQWvnkxBFq9ycGX1GZRtJXWcxHgBmZYvRGM=; b=pUTJVK5Abh2B1VSmYTZfJSQWSYBeD5rbXy44Ar7J/Lz4/Oo79Xrj+z0VfHVJ6fnNC4 BB9QJHnHiQ/cpCA1UD1cJURqS8pZ5bdJ0iexlujsVZ2yRssehbGN4sggXAwpj839djyn W15pj8Pmj2iTB4mwuofk0pHsnIGkNYmXf3exta8fHn7ahz41JZ1AWXsxnqxq54H0aU15 uL8mFTQueKQwxyac5MQeWmUwiyfGPnlh8vTo54TGOKdDYGP7u2YwcL53olmY7/j18KGx kdtuFP+tlca5W2qk0sCFBLTYK7rQH9P9mQ8qM/DMMcm5veDmISzKNIRkOQfV+ZZgxXS3 38bA== X-Gm-Message-State: AOJu0YwyrqCRe+UrYo70D6KWrft5y56E0wvjRbCU1T5S9wSpMUtkJXlx BW4AocKunIJtXRJXvSF78tN0s4rFMQtT/Z7NWKp/FjRIThibU64ned4Oqg== X-Google-Smtp-Source: AGHT+IFn6hYdgR5GlELn9GQxyLJRg3bOu/KE28VkYtoBk1YM2xB8hFE5phQw5OdDBjQ8q/4/uIonHg== X-Received: by 2002:a17:90b:103:b0:2c1:b6d5:9280 with SMTP id 98e67ed59e1d1-2c27db20b6amr5433544a91.28.1717684693660; Thu, 06 Jun 2024 07:38:13 -0700 (PDT) From: Rayhan Faizel To: devel@lists.libvirt.org Subject: [PATCH v2] qemu_block: Validate number of hosts for iSCSI disk device Date: Thu, 6 Jun 2024 19:57:51 +0530 Message-Id: <20240606142751.996763-1-rayhan.faizel@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: RQMJTM5RRPK27BRHAMY3PVCV54YKKN52 X-Message-ID-Hash: RQMJTM5RRPK27BRHAMY3PVCV54YKKN52 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: 1717684761761100001 Content-Type: text/plain; charset="utf-8" An iSCSI device with zero hosts will result in a segmentation fault. This p= atch adds a check for the number of hosts, which must be one in the case of iSCS= I. Minimal reproducing XML: MyGuest 4dea22b3-1d52-d8f3-2516-782e98ab3fa0 hvm 4096 Signed-off-by: Rayhan Faizel Reviewed-by: Peter Krempa --- This crashing XML was detected by the WIP fuzzer which is being developed as part of Google Summer of Code 2024. [Changes in v2] - Added testcase for iSCSI disk definitions with zero hosts src/qemu/qemu_block.c | 6 ++++ ...iscsi-zero-hosts-invalid.x86_64-latest.err | 1 + ...iscsi-zero-hosts-invalid.x86_64-latest.xml | 35 +++++++++++++++++++ .../disk-network-iscsi-zero-hosts-invalid.xml | 27 ++++++++++++++ tests/qemuxmlconftest.c | 2 ++ 5 files changed, 71 insertions(+) create mode 100644 tests/qemuxmlconfdata/disk-network-iscsi-zero-hosts-inv= alid.x86_64-latest.err create mode 100644 tests/qemuxmlconfdata/disk-network-iscsi-zero-hosts-inv= alid.x86_64-latest.xml create mode 100644 tests/qemuxmlconfdata/disk-network-iscsi-zero-hosts-inv= alid.xml diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 738b72d7ea..d6cdf521c4 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -602,6 +602,12 @@ qemuBlockStorageSourceGetISCSIProps(virStorageSource *= src, * } */ =20 + if (src->nhosts !=3D 1) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("iSCSI protocol accepts only one host")); + return NULL; + } + target =3D g_strdup(src->path); =20 /* Separate the target and lun */ diff --git a/tests/qemuxmlconfdata/disk-network-iscsi-zero-hosts-invalid.x8= 6_64-latest.err b/tests/qemuxmlconfdata/disk-network-iscsi-zero-hosts-inval= id.x86_64-latest.err new file mode 100644 index 0000000000..ec66bebf22 --- /dev/null +++ b/tests/qemuxmlconfdata/disk-network-iscsi-zero-hosts-invalid.x86_64-la= test.err @@ -0,0 +1 @@ +internal error: iSCSI protocol accepts only one host diff --git a/tests/qemuxmlconfdata/disk-network-iscsi-zero-hosts-invalid.x8= 6_64-latest.xml b/tests/qemuxmlconfdata/disk-network-iscsi-zero-hosts-inval= id.x86_64-latest.xml new file mode 100644 index 0000000000..ad556180ab --- /dev/null +++ b/tests/qemuxmlconfdata/disk-network-iscsi-zero-hosts-invalid.x86_64-la= test.xml @@ -0,0 +1,35 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + + qemu64 + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + + + + +
+ + +
+ + + + +