[v1] x86_iommu: Fix segfault when starting on non-PCI machines

[Qemu-devel] [PATCH RESEND 0/2] x86_iommu: Fix segfault when starting on non-PCI machines

Mohammed Gamal posted 2 patches 6 years, 6 months ago

Diff against v1 v1 v2 v3 v4 v5
Download series mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/1508144783-18792-1-git-send-email-mgamal@redhat.com

Test checkpatch passed

Test docker passed

Test s390x passed

hw/i386/amd_iommu.c   | 13 ++-----------
hw/i386/intel_iommu.c | 13 ++-----------
hw/i386/x86-iommu.c   | 13 +++++++++++++
3 files changed, 17 insertions(+), 22 deletions(-)

Expand all Fold all

[Qemu-devel] [PATCH RESEND 0/2] x86_iommu: Fix segfault when starting on non-PCI machines

Posted by Mohammed Gamal 6 years, 6 months ago

Starting qemu with
qemu-system-x86_64 -S -M isapc -device {amd|intel}-iommu
leads to a segfault. The code assume PCI bus is present and
tries to access the bus structure without checking.

The patch series moves the error checks from vtd_realize()
and amdvi_realize() to the generic x86_iommu_realize() and
adds a check for PCI bus presence.


Mohammed Gamal (2):
  x86_iommu: Move machine check to x86_iommu_realize()
  x86_iommu: check if machine has PCI bus

 hw/i386/amd_iommu.c   | 13 ++-----------
 hw/i386/intel_iommu.c | 13 ++-----------
 hw/i386/x86-iommu.c   | 13 +++++++++++++
 3 files changed, 17 insertions(+), 22 deletions(-)

-- 
1.8.3.1

Re: [Qemu-devel] [PATCH RESEND 0/2] x86_iommu: Fix segfault when starting on non-PCI machines

Posted by Peter Xu 6 years, 6 months ago

On Mon, Oct 16, 2017 at 11:06:21AM +0200, Mohammed Gamal wrote:
> Starting qemu with
> qemu-system-x86_64 -S -M isapc -device {amd|intel}-iommu
> leads to a segfault. The code assume PCI bus is present and
> tries to access the bus structure without checking.
> 
> The patch series moves the error checks from vtd_realize()
> and amdvi_realize() to the generic x86_iommu_realize() and
> adds a check for PCI bus presence.

Hi, Michael,

Would you like to pick Mohammed's two patches in your next pull
request?

Each of the patches has got 2 acks, and it does fix a problem.

Thanks,

> 
> 
> Mohammed Gamal (2):
>   x86_iommu: Move machine check to x86_iommu_realize()
>   x86_iommu: check if machine has PCI bus
> 
>  hw/i386/amd_iommu.c   | 13 ++-----------
>  hw/i386/intel_iommu.c | 13 ++-----------
>  hw/i386/x86-iommu.c   | 13 +++++++++++++
>  3 files changed, 17 insertions(+), 22 deletions(-)
> 
> -- 
> 1.8.3.1
> 

-- 
Peter Xu

Re: [Qemu-devel] [PATCH RESEND 0/2] x86_iommu: Fix segfault when starting on non-PCI machines

Posted by Michael S. Tsirkin 6 years, 6 months ago

On Mon, Oct 16, 2017 at 05:31:25PM +0800, Peter Xu wrote:
> On Mon, Oct 16, 2017 at 11:06:21AM +0200, Mohammed Gamal wrote:
> > Starting qemu with
> > qemu-system-x86_64 -S -M isapc -device {amd|intel}-iommu
> > leads to a segfault. The code assume PCI bus is present and
> > tries to access the bus structure without checking.
> > 
> > The patch series moves the error checks from vtd_realize()
> > and amdvi_realize() to the generic x86_iommu_realize() and
> > adds a check for PCI bus presence.
> 
> Hi, Michael,
> 
> Would you like to pick Mohammed's two patches in your next pull
> request?
> 
> Each of the patches has got 2 acks, and it does fix a problem.
> 
> Thanks,

Yes, thank you.

> > 
> > 
> > Mohammed Gamal (2):
> >   x86_iommu: Move machine check to x86_iommu_realize()
> >   x86_iommu: check if machine has PCI bus
> > 
> >  hw/i386/amd_iommu.c   | 13 ++-----------
> >  hw/i386/intel_iommu.c | 13 ++-----------
> >  hw/i386/x86-iommu.c   | 13 +++++++++++++
> >  3 files changed, 17 insertions(+), 22 deletions(-)
> > 
> > -- 
> > 1.8.3.1
> > 
> 
> -- 
> Peter Xu