On Thu, Aug 29, 2013 at 11:08:23AM +0100, Marc Zyngier wrote: > All the code in handle_mmio_cfg_reg() assumes the offset has > been shifted right to accomodate for the 2:1 bit compression, > but this is only done when getting the register addess.
address > > Shift the offset early so the code works mostly unchanged. > > Reported-by: Zhaobo (Bob, ERC) <[email protected]> > Signed-off-by: Marc Zyngier <[email protected]> > --- > virt/kvm/arm/vgic.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c > index a2d478a..902789f 100644 > --- a/virt/kvm/arm/vgic.c > +++ b/virt/kvm/arm/vgic.c > @@ -541,8 +541,12 @@ static bool handle_mmio_cfg_reg(struct kvm_vcpu *vcpu, > struct kvm_exit_mmio *mmio, phys_addr_t offset) > { > u32 val; > - u32 *reg = vgic_bitmap_get_reg(&vcpu->kvm->arch.vgic.irq_cfg, > - vcpu->vcpu_id, offset >> 1); > + u32 *reg; > + > + offset >>= 1; > + reg = vgic_bitmap_get_reg(&vcpu->kvm->arch.vgic.irq_cfg, > + vcpu->vcpu_id, offset); > + > if (offset & 2) > val = *reg >> 16; > else > -- > 1.8.2.3 > > > > _______________________________________________ > kvmarm mailing list > [email protected] > https://lists.cs.columbia.edu/cucslists/listinfo/kvmarm -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
