From nobody Mon Sep 16 19:53:41 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 1706637138802917.3642879822647; Tue, 30 Jan 2024 09:52:18 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id BE80C181C; Tue, 30 Jan 2024 12:52:17 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 4C12B1DE2; Tue, 30 Jan 2024 12:11:49 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id A33A71D0F; Tue, 30 Jan 2024 12:10:23 -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 9D1D51D2D for ; Tue, 30 Jan 2024 12:08:40 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-695-15NQSKYmPRyhCaYYs_JT0Q-1; Tue, 30 Jan 2024 12:08:37 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (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 8ECE8101377B for ; Tue, 30 Jan 2024 17:08:37 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 04A3E2166B31 for ; Tue, 30 Jan 2024 17:08:36 +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: 15NQSKYmPRyhCaYYs_JT0Q-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 25/31] virPCIVPDParseVPDLargeResourceString: Properly report errors Date: Tue, 30 Jan 2024 18:08:03 +0100 Message-ID: <6a5971c223338504b5461fbccc94b99e0ccf6f8b.1706633776.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: KFL3TM3VY5Y5GY5MVM27HQQWQWOBNAYA X-Message-ID-Hash: KFL3TM3VY5Y5GY5MVM27HQQWQWOBNAYA X-MailFrom: pkrempa@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 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" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1706637139373100001 Replace VIR_INFO being used as form of error reporting with proper virReportError and the usual return values. Signed-off-by: Peter Krempa --- src/util/virpcivpd.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/util/virpcivpd.c b/src/util/virpcivpd.c index 10cabff0b9..ddd79fa8bc 100644 --- a/src/util/virpcivpd.c +++ b/src/util/virpcivpd.c @@ -557,10 +557,9 @@ virPCIVPDParseVPDLargeResourceFields(int vpdFileFd, ui= nt16_t resPos, uint16_t re * @resDataLen: A length of the data portion of a resource. * @csum: A pointer to a 1-byte checksum. * - * Returns: a pointer to a VPDResource which needs to be freed by the call= er or - * NULL if getting it failed for some reason. + * Returns: 0 on success -1 and an error on failure */ -static bool +static int virPCIVPDParseVPDLargeResourceString(int vpdFileFd, uint16_t resPos, uint16_t resDataLen, uint8_t *csum, v= irPCIVPDResource *res) { @@ -570,15 +569,16 @@ virPCIVPDParseVPDLargeResourceString(int vpdFileFd, u= int16_t resPos, g_autofree char *buf =3D g_malloc0(resDataLen + 1); if (virPCIVPDReadVPDBytes(vpdFileFd, (uint8_t *)buf, resDataLen, resPo= s, csum) < 0) - return false; + return -1; resValue =3D g_strdup(g_strstrip(buf)); if (!virPCIVPDResourceIsValidTextValue(resValue)) { - VIR_INFO("The string resource has invalid characters in its value"= ); - return false; + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("failed to parse PCI VPD string value with invali= d characters")); + return -1; } res->name =3D g_steal_pointer(&resValue); - return true; + return 0; } /** @@ -652,8 +652,11 @@ virPCIVPDParse(int vpdFileFd) switch (tag) { /* Large resource type which is also a string: 0x80 | 0x02= =3D 0x82 */ case PCI_VPD_LARGE_RESOURCE_FLAG | PCI_VPD_STRING_RESOURCE_FLA= G: - isWellFormed =3D virPCIVPDParseVPDLargeResourceString(vpdF= ileFd, resPos, resDataLen, - &csum,= res); + if (virPCIVPDParseVPDLargeResourceString(vpdFileFd, resPos= , resDataLen, + &csum, res) < 0) + return NULL; + + isWellFormed =3D true; break; /* Large resource type which is also a VPD-R: 0x80 | 0x10 = =3D=3D 0x90 */ case PCI_VPD_LARGE_RESOURCE_FLAG | PCI_VPD_READ_ONLY_LARGE_RES= OURCE_FLAG: --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org