NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

virPCIVPDParseVPDLargeResourceString: Properly report errors

Browse Source 
Replace VIR_INFO being used as form of error reporting with proper
virReportError and the usual return values.

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 23:42:22 +01:00
parent c15a495902
commit aa5e3cc449
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/util/virpcivpd.c
View File

@ -557,10 +557,9 @@ virPCIVPDParseVPDLargeResourceFields(int vpdFileFd, uint16_t resPos, uint16_t re
* @resDataLen: A length of the data portion of a resource. * @resDataLen: A length of the data portion of a resource.
* @csum: A pointer to a 1-byte checksum. * @csum: A pointer to a 1-byte checksum.
* *
* Returns: a pointer to a VPDResource which needs to be freed by the caller or * Returns: 0 on success -1 and an error on failure
* NULL if getting it failed for some reason.
*/ */
static bool static int
virPCIVPDParseVPDLargeResourceString(int vpdFileFd, uint16_t resPos, virPCIVPDParseVPDLargeResourceString(int vpdFileFd, uint16_t resPos,
uint16_t resDataLen, uint8_t *csum, virPCIVPDResource *res) uint16_t resDataLen, uint8_t *csum, virPCIVPDResource *res)
{ {
@ -570,15 +569,16 @@ virPCIVPDParseVPDLargeResourceString(int vpdFileFd, uint16_t resPos,
g_autofree char *buf = g_malloc0(resDataLen + 1); g_autofree char *buf = g_malloc0(resDataLen + 1);
if (virPCIVPDReadVPDBytes(vpdFileFd, (uint8_t *)buf, resDataLen, resPos, csum) < 0) if (virPCIVPDReadVPDBytes(vpdFileFd, (uint8_t *)buf, resDataLen, resPos, csum) < 0)
return false; return -1;
resValue = g_strdup(g_strstrip(buf)); resValue = g_strdup(g_strstrip(buf));
if (!virPCIVPDResourceIsValidTextValue(resValue)) { if (!virPCIVPDResourceIsValidTextValue(resValue)) {
VIR_INFO("The string resource has invalid characters in its value"); virReportError(VIR_ERR_OPERATION_FAILED, "%s",
return false; _("failed to parse PCI VPD string value with invalid characters"));
return -1;
} }
res->name = g_steal_pointer(&resValue); res->name = g_steal_pointer(&resValue);
return true; return 0;
} }
/** /**
@ -652,8 +652,11 @@ virPCIVPDParse(int vpdFileFd)
switch (tag) { switch (tag) {
/* Large resource type which is also a string: 0x80 | 0x02 = 0x82 */ /* Large resource type which is also a string: 0x80 | 0x02 = 0x82 */
case PCI_VPD_LARGE_RESOURCE_FLAG | PCI_VPD_STRING_RESOURCE_FLAG: case PCI_VPD_LARGE_RESOURCE_FLAG | PCI_VPD_STRING_RESOURCE_FLAG:
isWellFormed = virPCIVPDParseVPDLargeResourceString(vpdFileFd, resPos, resDataLen, if (virPCIVPDParseVPDLargeResourceString(vpdFileFd, resPos, resDataLen,
&csum, res); &csum, res) < 0)
return NULL;
isWellFormed = true;
break; break;
/* Large resource type which is also a VPD-R: 0x80 | 0x10 == 0x90 */ /* Large resource type which is also a VPD-R: 0x80 | 0x10 == 0x90 */
case PCI_VPD_LARGE_RESOURCE_FLAG | PCI_VPD_READ_ONLY_LARGE_RESOURCE_FLAG: case PCI_VPD_LARGE_RESOURCE_FLAG | PCI_VPD_READ_ONLY_LARGE_RESOURCE_FLAG: