1 files changed, 54 insertions, 24 deletions

diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c
index 7589e2c82db2..06073fac03a9 100644
--- a/virt/kvm/arm/vgic.c
+++ b/virt/kvm/arm/vgic.c
@@ -2440,7 +2440,8 @@ out:
         return ret;
 }
 
-static int vgic_set_attr(struct kvm_device *dev, struct kvm_device_attr *attr)
+static int vgic_set_common_attr(struct kvm_device *dev,
+                                struct kvm_device_attr *attr)
 {
         int r;
 
@@ -2456,17 +2457,6 @@ static int vgic_set_attr(struct kvm_device *dev, struct kvm_device_attr *attr)
                 r = kvm_vgic_addr(dev->kvm, type, &addr, true);
                 return (r == -ENODEV) ? -ENXIO : r;
         }
-
-        case KVM_DEV_ARM_VGIC_GRP_DIST_REGS:
-        case KVM_DEV_ARM_VGIC_GRP_CPU_REGS: {
-                u32 __user *uaddr = (u32 __user *)(long)attr->addr;
-                u32 reg;
-
-                if (get_user(reg, uaddr))
-                        return -EFAULT;
-
-                return vgic_attr_regs_access(dev, attr, &reg, true);
-        }
         case KVM_DEV_ARM_VGIC_GRP_NR_IRQS: {
                 u32 __user *uaddr = (u32 __user *)(long)attr->addr;
                 u32 val;
@@ -2510,7 +2500,33 @@ static int vgic_set_attr(struct kvm_device *dev, struct kvm_device_attr *attr)
         return -ENXIO;
 }
 
-static int vgic_get_attr(struct kvm_device *dev, struct kvm_device_attr *attr)
+static int vgic_set_attr(struct kvm_device *dev, struct kvm_device_attr *attr)
+{
+        int ret;
+
+        ret = vgic_set_common_attr(dev, attr);
+        if (ret != -ENXIO)
+                return ret;
+
+        switch (attr->group) {
+        case KVM_DEV_ARM_VGIC_GRP_DIST_REGS:
+        case KVM_DEV_ARM_VGIC_GRP_CPU_REGS: {
+                u32 __user *uaddr = (u32 __user *)(long)attr->addr;
+                u32 reg;
+
+                if (get_user(reg, uaddr))
+                        return -EFAULT;
+
+                return vgic_attr_regs_access(dev, attr, &reg, true);
+        }
+
+        }
+
+        return -ENXIO;
+}
+
+static int vgic_get_common_attr(struct kvm_device *dev,
+                                struct kvm_device_attr *attr)
 {
         int r = -ENXIO;
 
@@ -2528,27 +2544,41 @@ static int vgic_get_attr(struct kvm_device *dev, struct kvm_device_attr *attr)
                         return -EFAULT;
                 break;
         }
+        case KVM_DEV_ARM_VGIC_GRP_NR_IRQS: {
+                u32 __user *uaddr = (u32 __user *)(long)attr->addr;
+
+                r = put_user(dev->kvm->arch.vgic.nr_irqs, uaddr);
+                break;
+        }
+
+        }
+
+        return r;
+}
+
+static int vgic_get_attr(struct kvm_device *dev, struct kvm_device_attr *attr)
+{
+        int ret;
+
+        ret = vgic_get_common_attr(dev, attr);
+        if (ret != -ENXIO)
+                return ret;
 
+        switch (attr->group) {
         case KVM_DEV_ARM_VGIC_GRP_DIST_REGS:
         case KVM_DEV_ARM_VGIC_GRP_CPU_REGS: {
                 u32 __user *uaddr = (u32 __user *)(long)attr->addr;
                 u32 reg = 0;
 
-                r = vgic_attr_regs_access(dev, attr, &reg, false);
-                if (r)
-                        return r;
-                r = put_user(reg, uaddr);
-                break;
-        }
-        case KVM_DEV_ARM_VGIC_GRP_NR_IRQS: {
-                u32 __user *uaddr = (u32 __user *)(long)attr->addr;
-                r = put_user(dev->kvm->arch.vgic.nr_irqs, uaddr);
-                break;
+                ret = vgic_attr_regs_access(dev, attr, &reg, false);
+                if (ret)
+                        return ret;
+                return put_user(reg, uaddr);
         }
 
         }
 
-        return r;
+        return -ENXIO;
 }
 
 static int vgic_has_attr_regs(const struct mmio_range *ranges,