diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-13 13:39:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-13 13:39:36 -0700 |
| commit | 15999328946bd778b7bbf57179ee871dd5279b04 (patch) | |
| tree | 42a1bb4961982b58d2087ec169a27bb0c6b8fecd /drivers/xen | |
| parent | 9350cd0190c0d60915ec704112c864d858a0d31c (diff) | |
| parent | 21a235bce12361e64adfc2ef97e4ae2e51ad63d4 (diff) | |
Merge tag 'for-linus-6.5-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross:
- a cleanup of the Xen related ELF-notes
- a fix for virtio handling in Xen dom0 when running Xen in a VM
* tag 'for-linus-6.5-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen/virtio: Fix NULL deref when a bridge of PCI root bus has no parent
x86/Xen: tidy xen-head.S
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/grant-dma-ops.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/xen/grant-dma-ops.c b/drivers/xen/grant-dma-ops.c index 9784a77fa3c9..76f6f26265a3 100644 --- a/drivers/xen/grant-dma-ops.c +++ b/drivers/xen/grant-dma-ops.c @@ -303,6 +303,8 @@ static struct device_node *xen_dt_get_node(struct device *dev) while (!pci_is_root_bus(bus)) bus = bus->parent; + if (!bus->bridge->parent) + return NULL; return of_node_get(bus->bridge->parent->of_node); } |