Message ID | 87c597a3-d7f0-bd20-4c43-afd5ec919be3@suse.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | IOMMU: add missing HVM check | expand |
On Wed, Oct 02, 2019 at 12:10:06PM +0200, Jan Beulich wrote: > Fix an unguarded d->arch.hvm access in assign_device(). > > Signed-off-by: Jan Beulich <jbeulich@suse.com> Reviewed-by: Roger Pau Monné <roger.pau@citrix.com> I'm also adding Juergen as I think this is suitable for 4.13. Thanks, Roger.
On 02.10.2019 12:14, Roger Pau Monné wrote: > On Wed, Oct 02, 2019 at 12:10:06PM +0200, Jan Beulich wrote: >> Fix an unguarded d->arch.hvm access in assign_device(). >> >> Signed-off-by: Jan Beulich <jbeulich@suse.com> > > Reviewed-by: Roger Pau Monné <roger.pau@citrix.com> Thanks. > I'm also adding Juergen as I think this is suitable for 4.13. As a previously posted fix I didn't think it needed a release ack just yet, i.e. before the freeze. Jan
On 02.10.19 12:19, Jan Beulich wrote: > On 02.10.2019 12:14, Roger Pau Monné wrote: >> On Wed, Oct 02, 2019 at 12:10:06PM +0200, Jan Beulich wrote: >>> Fix an unguarded d->arch.hvm access in assign_device(). >>> >>> Signed-off-by: Jan Beulich <jbeulich@suse.com> >> >> Reviewed-by: Roger Pau Monné <roger.pau@citrix.com> > > Thanks. > >> I'm also adding Juergen as I think this is suitable for 4.13. > > As a previously posted fix I didn't think it needed a release > ack just yet, i.e. before the freeze. Right. Juergen
On 02/10/2019 11:14, Roger Pau Monné wrote: > On Wed, Oct 02, 2019 at 12:10:06PM +0200, Jan Beulich wrote: >> Fix an unguarded d->arch.hvm access in assign_device(). >> >> Signed-off-by: Jan Beulich <jbeulich@suse.com> > Reviewed-by: Roger Pau Monné <roger.pau@citrix.com> Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
--- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -1488,7 +1488,8 @@ static int assign_device(struct domain * /* Prevent device assign if mem paging or mem sharing have been * enabled for this domain */ - if ( unlikely(d->arch.hvm.mem_sharing_enabled || + if ( unlikely((is_hvm_domain(d) && + d->arch.hvm.mem_sharing_enabled) || vm_event_check_ring(d->vm_event_paging) || p2m_get_hostp2m(d)->global_logdirty) ) return -EXDEV;
Fix an unguarded d->arch.hvm access in assign_device(). Signed-off-by: Jan Beulich <jbeulich@suse.com> --- Split from now withdrawn "x86/HVM: p2m_ram_ro is incompatible with device pass-through".