External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 11:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

virPCIVPDParse: Do reasonable error reporting

Browse Source 
Remove the wannabe error reporting via 'VIR_DEBUG/VIR_INFO' in favor of
proper errors.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2024-01-29 17:12:43 +01:00
parent dfc85658bd
commit f85a382a0e
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/util/virpcivpd.c
View File

@ -616,7 +616,7 @@ virPCIVPDParse(int vpdFileFd)
uint16_t resPos = 0, resDataLen; uint16_t resPos = 0, resDataLen;
uint8_t tag = 0; uint8_t tag = 0;
bool endResReached = false, hasReadOnly = false; bool hasReadOnly = false;
g_autoptr(virPCIVPDResource) res = g_new0(virPCIVPDResource, 1); g_autoptr(virPCIVPDResource) res = g_new0(virPCIVPDResource, 1);
@ -628,9 +628,8 @@ virPCIVPDParse(int vpdFileFd)
/* 0x80 == 0b10000000 - the large resource data type flag. */ /* 0x80 == 0b10000000 - the large resource data type flag. */
if (tag & PCI_VPD_LARGE_RESOURCE_FLAG) { if (tag & PCI_VPD_LARGE_RESOURCE_FLAG) {
if (resPos > PCI_VPD_ADDR_MASK + 1 - 3) { if (resPos > PCI_VPD_ADDR_MASK + 1 - 3) {
/* Bail if the large resource starts at the position /* Bail if the large resource starts at the position where the end tag should be. */
* where the end tag should be. */ goto malformed;
break;
} }
/* Read the two length bytes of the large resource record. */ /* Read the two length bytes of the large resource record. */
@ -649,14 +648,21 @@ virPCIVPDParse(int vpdFileFd)
/* Change the position to the byte past the byte containing tag and length bits. */ /* Change the position to the byte past the byte containing tag and length bits. */
resPos += 1; resPos += 1;
} }
if (tag == PCI_VPD_RESOURCE_END_TAG) { if (tag == PCI_VPD_RESOURCE_END_TAG) {
/* Stop VPD traversal since the end tag was encountered. */ /* Stop VPD traversal since the end tag was encountered. */
endResReached = true; if (!hasReadOnly) {
break; virReportError(VIR_ERR_OPERATION_FAILED, "%s",
_("failed to read the PCI VPD data: missing read-only section"));
return NULL;
} }
return g_steal_pointer(&res);
}
if (resDataLen > PCI_VPD_ADDR_MASK + 1 - resPos) { if (resDataLen > PCI_VPD_ADDR_MASK + 1 - resPos) {
/* Bail if the resource is too long to fit into the VPD address space. */ /* Bail if the resource is too long to fit into the VPD address space. */
break; goto malformed;
} }
switch (tag) { switch (tag) {
@ -686,22 +692,16 @@ virPCIVPDParse(int vpdFileFd)
/* While we cannot parse unknown resource types, they can still be skipped /* While we cannot parse unknown resource types, they can still be skipped
* based on the header and data length. */ * based on the header and data length. */
VIR_DEBUG("Encountered an unexpected VPD resource tag: %#x", tag); VIR_DEBUG("Encountered an unexpected VPD resource tag: %#x", tag);
resPos += resDataLen;
continue;
} }
/* Continue processing other resource records. */ /* Continue processing other resource records. */
resPos += resDataLen; resPos += resDataLen;
} }
if (!hasReadOnly) {
VIR_DEBUG("Encountered an invalid VPD: does not have a VPD-R record"); malformed:
virReportError(VIR_ERR_OPERATION_FAILED, "%s",
_("failed to read the PCI VPD data: malformed data"));
return NULL; return NULL;
} else if (!endResReached) {
/* Does not have an end tag. */
VIR_DEBUG("Encountered an invalid VPD");
return NULL;
}
return g_steal_pointer(&res);
} }
#else /* ! __linux__ */ #else /* ! __linux__ */