Skip to content

ext/pci: fix crash on devices with non-standard PCI segment #802

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bartlomiejkida wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ext/pci: fix crash on devices with non-standard PCI segment #802

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion qubes/ext/pci.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,10 @@ def __init__(self, port: Port, libvirt_name=None):
dev_match = self._libvirt_regex.match(libvirt_name)
if not dev_match:
raise UnsupportedDevice(libvirt_name)
port_id = sbdf_to_path(libvirt_name)
try:
port_id = sbdf_to_path(libvirt_name)
except (AssertionError, ValueError, KeyError):

@marmarek marmarek May 4, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't like catching AssertionError here. Asserts should never trigger - if they do, it means a but somewhere (might be also in the assert condition itself).

But also, shouldn't the VMD case be handled by the regex match above already? It has 4 hex digits for segment, but VMD devices have 5, so it shouldn't match there.

raise UnsupportedDevice(libvirt_name)
port = Port(
backend_domain=port.backend_domain,
port_id=port_id,
Expand Down