From nobody Fri May 17 11:29:09 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1703645226187238.17386211995836; Tue, 26 Dec 2023 18:47:06 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 4995A19FE; Tue, 26 Dec 2023 21:47:04 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id C7F7419B5; Tue, 26 Dec 2023 21:45:31 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 5347F199F; Tue, 26 Dec 2023 21:45:26 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 AAF6B19AE for ; Tue, 26 Dec 2023 21:45:25 -0500 (EST) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-487-VS53h39xP_uzRsW_EUrIDg-1; Tue, 26 Dec 2023 21:45:22 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AB89228AC1E7 for ; Wed, 27 Dec 2023 02:45:22 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.72.112.131]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6D39A2026D6F; Wed, 27 Dec 2023 02:45:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: VS53h39xP_uzRsW_EUrIDg-1 From: Han Han To: devel@lists.libvirt.org Subject: [PATCH] storage_util: Fix the false condition in virStorageBackendDeviceIsEmpty Date: Wed, 27 Dec 2023 10:45:12 +0800 Message-ID: <20231227024518.20209-1-hhan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: ANL7PXLBGESTNETJEC5VQTRK5JWYJFNB X-Message-ID-Hash: ANL7PXLBGESTNETJEC5VQTRK5JWYJFNB X-MailFrom: hhan@redhat.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: Han Han 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: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1703645227224100001 In virStorageBackendDeviceIsEmpty, the return value for virStorageBackendPARTEDValidLabel is -1 or 0. That makes the later condition 'ret =3D=3D -2' make always false. Remove the always false condition. Found by Linux Verification Center (portal.linuxtesting.ru) with SVACE. Fixes: https://gitlab.com/libvirt/libvirt/-/issues/576 Signed-off-by: Han Han --- src/storage/storage_util.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 7bf815d978..82bcfa5838 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -3352,15 +3352,9 @@ virStorageBackendDeviceIsEmpty(const char *devpath, writelabel)) =3D=3D -2) ret =3D virStorageBackendPARTEDValidLabel(devpath, format, writela= bel); =20 - if (ret =3D=3D -2 && !writelabel) + if (!writelabel) ret =3D 0; =20 - if (ret =3D=3D -2) { - virReportError(VIR_ERR_OPERATION_INVALID, - _("Unable to probe '%1$s' for existing data, forced= overwrite is necessary"), - devpath); - } - return ret =3D=3D 0; } =20 --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org