Merge branch 'main' into 3802-experiment

This commit is contained in:
Mykola Grymalyuk
2023-03-13 11:50:55 -06:00
+10 -5
View File
@@ -47,11 +47,16 @@ class PCIDevice:
vendor_id_unspoofed = None vendor_id_unspoofed = None
device_id_unspoofed = None device_id_unspoofed = None
if "IOName" in properties and properties["IOName"].startswith("pci"): if "IOName" in properties:
vendor_id_unspoofed, device_id_unspoofed = (int(i, 16) for i in properties["IOName"][3:].split(",")) ioname = properties["IOName"]
if anti_spoof: if type(ioname) is bytes:
vendor_id = vendor_id_unspoofed ioname = ioname.strip(b"\0").decode()
device_id = device_id_unspoofed
if ioname.startswith("pci"):
vendor_id_unspoofed, device_id_unspoofed = (int(i, 16) for i in ioname[3:].split(","))
if anti_spoof:
vendor_id = vendor_id_unspoofed
device_id = device_id_unspoofed
if vendor_id is None and device_id is None: if vendor_id is None and device_id is None:
vendor_id, device_id = [int.from_bytes(properties[i][:4], byteorder="little") for i in ["vendor-id", "device-id"]] vendor_id, device_id = [int.from_bytes(properties[i][:4], byteorder="little") for i in ["vendor-id", "device-id"]]