External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

virNodeDeviceCapVPDFormat: Properly escape system-originated strings

Browse Source 
Similarly to previous commit other specific fields which come from the
system data and aren't sanitized enough to be safe for XML were also
formatted via virBufferAsprintf.

Other static and safe strings used virBufferEscapeString instead of
virBufferAddLit.

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-30 17:11:37 +01:00
parent 5373b8c02c
commit 2ccac1e42f
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/conf/node_device_conf.c
View File

@ -270,14 +270,6 @@ virNodeDeviceCapVPDFormatCustomSystemField(virPCIVPDResourceCustom *field, virBu
virNodeDeviceCapVPDFormatCustomField(buf, "system_field", field); virNodeDeviceCapVPDFormatCustomField(buf, "system_field", field);
} }
static inline void
virNodeDeviceCapVPDFormatRegularField(virBuffer *buf, const char *keyword, const char *value)
{
if (keyword == NULL || value == NULL)
return;
virBufferAsprintf(buf, "<%s>%s</%s>\n", keyword, value, keyword);
}
static void static void
virNodeDeviceCapVPDFormat(virBuffer *buf, virPCIVPDResource *res) virNodeDeviceCapVPDFormat(virBuffer *buf, virPCIVPDResource *res)
@ -290,31 +282,33 @@ virNodeDeviceCapVPDFormat(virBuffer *buf, virPCIVPDResource *res)
virBufferEscapeString(buf, "<name>%s</name>\n", res->name); virBufferEscapeString(buf, "<name>%s</name>\n", res->name);
if (res->ro != NULL) { if (res->ro != NULL) {
virBufferEscapeString(buf, "<fields access='%s'>\n", "readonly"); virBufferAddLit(buf, "<fields access='readonly'>\n");
virBufferAdjustIndent(buf, 2); virBufferAdjustIndent(buf, 2);
virNodeDeviceCapVPDFormatRegularField(buf, "change_level", res->ro->change_level);
virNodeDeviceCapVPDFormatRegularField(buf, "manufacture_id", res->ro->manufacture_id); virBufferEscapeString(buf, "<change_level>%s</change_level>\n", res->ro->change_level);
virNodeDeviceCapVPDFormatRegularField(buf, "part_number", res->ro->part_number); virBufferEscapeString(buf, "<manufacture_id>%s</manufacture_id>\n", res->ro->manufacture_id);
virNodeDeviceCapVPDFormatRegularField(buf, "serial_number", res->ro->serial_number); virBufferEscapeString(buf, "<part_number>%s</part_number>\n", res->ro->part_number);
virBufferEscapeString(buf, "<serial_number>%s</serial_number>\n", res->ro->serial_number);
g_ptr_array_foreach(res->ro->vendor_specific, g_ptr_array_foreach(res->ro->vendor_specific,
(GFunc)virNodeDeviceCapVPDFormatCustomVendorField, buf); (GFunc)virNodeDeviceCapVPDFormatCustomVendorField, buf);
virBufferAdjustIndent(buf, -2);
virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</fields>\n"); virBufferAddLit(buf, "</fields>\n");
} }
if (res->rw != NULL) { if (res->rw != NULL) {
virBufferEscapeString(buf, "<fields access='%s'>\n", "readwrite"); virBufferAddLit(buf, "<fields access='readwrite'>\n");
virBufferAdjustIndent(buf, 2); virBufferAdjustIndent(buf, 2);
virNodeDeviceCapVPDFormatRegularField(buf, "asset_tag", res->rw->asset_tag);
virBufferEscapeString(buf, "<asset_tag>%s</asset_tag>\n", res->rw->asset_tag);
g_ptr_array_foreach(res->rw->vendor_specific, g_ptr_array_foreach(res->rw->vendor_specific,
(GFunc)virNodeDeviceCapVPDFormatCustomVendorField, buf); (GFunc)virNodeDeviceCapVPDFormatCustomVendorField, buf);
g_ptr_array_foreach(res->rw->system_specific, g_ptr_array_foreach(res->rw->system_specific,
(GFunc)virNodeDeviceCapVPDFormatCustomSystemField, buf); (GFunc)virNodeDeviceCapVPDFormatCustomSystemField, buf);
virBufferAdjustIndent(buf, -2);
virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</fields>\n"); virBufferAddLit(buf, "</fields>\n");
} }