2 files changed, 7 insertions, 3 deletions

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index dce75b760312..148ed666e311 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -2000,6 +2000,9 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata)
         case MSR_KVM_STEAL_TIME:
                 data = vcpu->arch.st.msr_val;
                 break;
+        case MSR_KVM_PV_EOI_EN:
+                data = vcpu->arch.pv_eoi.msr_val;
+                break;
         case MSR_IA32_P5_MC_ADDR:
         case MSR_IA32_P5_MC_TYPE:
         case MSR_IA32_MCG_CAP:
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 246852397e30..d617f69131d7 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1976,9 +1976,10 @@ static long kvm_vcpu_compat_ioctl(struct file *filp,
                         if (copy_from_user(&csigset, sigmask_arg->sigset,
                                            sizeof csigset))
                                 goto out;
-                }
-                sigset_from_compat(&sigset, &csigset);
-                r = kvm_vcpu_ioctl_set_sigmask(vcpu, &sigset);
+                        sigset_from_compat(&sigset, &csigset);
+                        r = kvm_vcpu_ioctl_set_sigmask(vcpu, &sigset);
+                } else
+                        r = kvm_vcpu_ioctl_set_sigmask(vcpu, NULL);
                 break;
         }
         default: