KVM: s390: Disallow invalid bits in kvm_valid_regs and kvm_dirty_regs
PATCH 1/1 KVM: s390: Disallow invalid bits in kvm_valid_regs and kvm_dirty_regs
If unknown bits are set in kvm_valid_regs or kvm_dirty_regs, this clearly indicates that something went wrong in the KVM userspace application. The x86 variant of KVM already contains a check for bad bits (and the corresponding kselftest checks this), so let's do the same on s390x now, too.
--- arch/s390/include/uapi/asm/kvm.h | 6 ++++ arch/s390/kvm/kvm-s390.c | 4 +++ .../selftests/kvm/s390x/sync_regs_test.c | 30 +++++++++++++++++++ 3 files changed, 40 insertions(+)
arch/s390/include/uapi/asm/kvm.h +6 -0
@@ -231,6 +231,12 @@ struct kvm_guest_debug_arch {#define KVM_SYNC_GSCB (1UL << 9)#define KVM_SYNC_BPBC (1UL << 10)#define KVM_SYNC_ETOKEN (1UL << 11) + +#define KVM_SYNC_S390_VALID_FIELDS \ + (KVM_SYNC_PREFIX | KVM_SYNC_GPRS | KVM_SYNC_ACRS | KVM_SYNC_CRS | \ + KVM_SYNC_ARCH0 | KVM_SYNC_PFAULT | KVM_SYNC_VRS | KVM_SYNC_RICCB | \ + KVM_SYNC_FPRS | KVM_SYNC_GSCB | KVM_SYNC_BPBC | KVM_SYNC_ETOKEN) +/* length and alignment of the sdnx as a power of two */ #define SDNXC 8#define SDNXL (1UL << SDNXC)
arch/s390/kvm/kvm-s390.c +4 -0
@@ -3998,6 +3998,10 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)if (kvm_run->immediate_exit)return -EINTR ; +if (kvm_run->kvm_valid_regs & ~KVM_SYNC_S390_VALID_FIELDS || + kvm_run->kvm_dirty_regs & ~KVM_SYNC_S390_VALID_FIELDS ) +return -EINVAL ; +vcpu_load (vcpu);if (guestdbg_exit_pending (vcpu)) {
tools/testing/selftests/kvm/s390x/sync_regs_test.c +30 -0
@@ -85,6 +85,36 @@ int main(int argc, char *argv[]) run =vcpu_state (vm,VCPU_ID ); +/* Request reading invalid register set from VCPU. */ + run->kvm_valid_regs =INVALID_SYNC_FIELD ; + rv =_vcpu_run (vm,VCPU_ID ); +TEST_ASSERT (rv <0 && errno ==EINVAL , +"Invalid kvm_valid_regs did not cause expected KVM_RUN error: %d\n" , + rv); +vcpu_state (vm,VCPU_ID )->kvm_valid_regs =0 ; + + run->kvm_valid_regs =INVALID_SYNC_FIELD |TEST_SYNC_FIELDS ; + rv =_vcpu_run (vm,VCPU_ID ); +TEST_ASSERT (rv <0 && errno ==EINVAL , +"Invalid kvm_valid_regs did not cause expected KVM_RUN error: %d\n" , + rv); +vcpu_state (vm,VCPU_ID )->kvm_valid_regs =0 ; + +/* Request setting invalid register set into VCPU. */ + run->kvm_dirty_regs =INVALID_SYNC_FIELD ; + rv =_vcpu_run (vm,VCPU_ID ); +TEST_ASSERT (rv <0 && errno ==EINVAL , +"Invalid kvm_dirty_regs did not cause expected KVM_RUN error: %d\n" , + rv); +vcpu_state (vm,VCPU_ID )->kvm_dirty_regs =0 ; + + run->kvm_dirty_regs =INVALID_SYNC_FIELD |TEST_SYNC_FIELDS ; + rv =_vcpu_run (vm,VCPU_ID ); +TEST_ASSERT (rv <0 && errno ==EINVAL , +"Invalid kvm_dirty_regs did not cause expected KVM_RUN error: %d\n" , + rv); +vcpu_state (vm,VCPU_ID )->kvm_dirty_regs =0 ; +/* Request and verify all valid register sets. */ run->kvm_valid_regs =TEST_SYNC_FIELDS ; rv =_vcpu_run (vm,VCPU_ID );
Signature · 1 line
2.18.1
Quoted 7 lines · Thomas Huth
If unknown bits are set in
kvm_valid_regsorkvm_dirty_regs, this clearly indicates that something went wrong in the KVM userspace application. The x86 variant of KVM already contains a check for bad bits (and the corresponding kselftest checks this), so let's do the same on s390x now, too.Signed-off-by Thomas Huth <[email protected]>
I think it would make sense to split the kvm changes from the test.
Quoted 80 lines
--- arch/s390/include/uapi/asm/kvm.h | 6 ++++ arch/s390/kvm/kvm-s390.c | 4 +++ .../selftests/kvm/s390x/sync_regs_test.c | 30 +++++++++++++++++++ 3 files changed, 40 insertions(+)arch/s390/include/uapi/asm/kvm.h +6
-0@@ -231,6 +231,12 @@ struct kvm_guest_debug_arch {#define KVM_SYNC_GSCB (1UL << 9)#define KVM_SYNC_BPBC (1UL << 10)#define KVM_SYNC_ETOKEN (1UL << 11) + +#define KVM_SYNC_S390_VALID_FIELDS \ + (KVM_SYNC_PREFIX | KVM_SYNC_GPRS | KVM_SYNC_ACRS | KVM_SYNC_CRS | \ + KVM_SYNC_ARCH0 | KVM_SYNC_PFAULT | KVM_SYNC_VRS | KVM_SYNC_RICCB | \ + KVM_SYNC_FPRS | KVM_SYNC_GSCB | KVM_SYNC_BPBC | KVM_SYNC_ETOKEN) +/* length and alignment of the sdnx as a power of two */ #define SDNXC 8#define SDNXL (1UL << SDNXC)arch/s390/kvm/kvm-s390.c +4
-0@@ -3998,6 +3998,10 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)if (kvm_run->immediate_exit)return -EINTR ; +if (kvm_run->kvm_valid_regs & ~KVM_SYNC_S390_VALID_FIELDS || + kvm_run->kvm_dirty_regs & ~KVM_SYNC_S390_VALID_FIELDS ) +return -EINVAL ; +vcpu_load (vcpu);if (guestdbg_exit_pending (vcpu)) {tools/testing/selftests/kvm/s390x/sync_regs_test.c +30
-0@@ -85,6 +85,36 @@ int main(int argc, char *argv[]) run =vcpu_state (vm,VCPU_ID ); +/* Request reading invalid register set from VCPU. */ + run->kvm_valid_regs =INVALID_SYNC_FIELD ; + rv =_vcpu_run (vm,VCPU_ID ); +TEST_ASSERT (rv <0 && errno ==EINVAL , +"Invalid kvm_valid_regs did not cause expected KVM_RUN error: %d\n" , + rv); +vcpu_state (vm,VCPU_ID )->kvm_valid_regs =0 ; + + run->kvm_valid_regs =INVALID_SYNC_FIELD |TEST_SYNC_FIELDS ; + rv =_vcpu_run (vm,VCPU_ID ); +TEST_ASSERT (rv <0 && errno ==EINVAL , +"Invalid kvm_valid_regs did not cause expected KVM_RUN error: %d\n" , + rv); +vcpu_state (vm,VCPU_ID )->kvm_valid_regs =0 ; + +/* Request setting invalid register set into VCPU. */ + run->kvm_dirty_regs =INVALID_SYNC_FIELD ; + rv =_vcpu_run (vm,VCPU_ID ); +TEST_ASSERT (rv <0 && errno ==EINVAL , +"Invalid kvm_dirty_regs did not cause expected KVM_RUN error: %d\n" , + rv); +vcpu_state (vm,VCPU_ID )->kvm_dirty_regs =0 ; + + run->kvm_dirty_regs =INVALID_SYNC_FIELD |TEST_SYNC_FIELDS ; + rv =_vcpu_run (vm,VCPU_ID ); +TEST_ASSERT (rv <0 && errno ==EINVAL , +"Invalid kvm_dirty_regs did not cause expected KVM_RUN error: %d\n" , + rv); +vcpu_state (vm,VCPU_ID )->kvm_dirty_regs =0 ; +/* Request and verify all valid register sets. */ run->kvm_valid_regs =TEST_SYNC_FIELDS ; rv =_vcpu_run (vm,VCPU_ID );
Christian Borntraeger
Reviewed-byQuoted 10 lines · Janosch Frank
Quoted 7 lines · Thomas Huth
If unknown bits are set in
kvm_valid_regsorkvm_dirty_regs, this clearly indicates that something went wrong in the KVM userspace application. The x86 variant of KVM already contains a check for bad bits (and the corresponding kselftest checks this), so let's do the same on s390x now, too.Signed-off-by Thomas Huth <[email protected]>I think it would make sense to split the kvm changes from the test.
Yes, this would allow to backport the non-kselftest part if necessary.
With that
Quoted 85 lines
Reviewed-by Janosch Frank <[email protected]>Quoted 80 lines
--- arch/s390/include/uapi/asm/kvm.h | 6 ++++ arch/s390/kvm/kvm-s390.c | 4 +++ .../selftests/kvm/s390x/sync_regs_test.c | 30 +++++++++++++++++++ 3 files changed, 40 insertions(+)arch/s390/include/uapi/asm/kvm.h +6
-0@@ -231,6 +231,12 @@ struct kvm_guest_debug_arch {#define KVM_SYNC_GSCB (1UL << 9)#define KVM_SYNC_BPBC (1UL << 10)#define KVM_SYNC_ETOKEN (1UL << 11) + +#define KVM_SYNC_S390_VALID_FIELDS \ + (KVM_SYNC_PREFIX | KVM_SYNC_GPRS | KVM_SYNC_ACRS | KVM_SYNC_CRS | \ + KVM_SYNC_ARCH0 | KVM_SYNC_PFAULT | KVM_SYNC_VRS | KVM_SYNC_RICCB | \ + KVM_SYNC_FPRS | KVM_SYNC_GSCB | KVM_SYNC_BPBC | KVM_SYNC_ETOKEN) +/* length and alignment of the sdnx as a power of two */ #define SDNXC 8#define SDNXL (1UL << SDNXC)arch/s390/kvm/kvm-s390.c +4
-0@@ -3998,6 +3998,10 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)if (kvm_run->immediate_exit)return -EINTR ; +if (kvm_run->kvm_valid_regs & ~KVM_SYNC_S390_VALID_FIELDS || + kvm_run->kvm_dirty_regs & ~KVM_SYNC_S390_VALID_FIELDS ) +return -EINVAL ; +vcpu_load (vcpu);if (guestdbg_exit_pending (vcpu)) {tools/testing/selftests/kvm/s390x/sync_regs_test.c +30
-0@@ -85,6 +85,36 @@ int main(int argc, char *argv[]) run =vcpu_state (vm,VCPU_ID ); +/* Request reading invalid register set from VCPU. */ + run->kvm_valid_regs =INVALID_SYNC_FIELD ; + rv =_vcpu_run (vm,VCPU_ID ); +TEST_ASSERT (rv <0 && errno ==EINVAL , +"Invalid kvm_valid_regs did not cause expected KVM_RUN error: %d\n" , + rv); +vcpu_state (vm,VCPU_ID )->kvm_valid_regs =0 ; + + run->kvm_valid_regs =INVALID_SYNC_FIELD |TEST_SYNC_FIELDS ; + rv =_vcpu_run (vm,VCPU_ID ); +TEST_ASSERT (rv <0 && errno ==EINVAL , +"Invalid kvm_valid_regs did not cause expected KVM_RUN error: %d\n" , + rv); +vcpu_state (vm,VCPU_ID )->kvm_valid_regs =0 ; + +/* Request setting invalid register set into VCPU. */ + run->kvm_dirty_regs =INVALID_SYNC_FIELD ; + rv =_vcpu_run (vm,VCPU_ID ); +TEST_ASSERT (rv <0 && errno ==EINVAL , +"Invalid kvm_dirty_regs did not cause expected KVM_RUN error: %d\n" , + rv); +vcpu_state (vm,VCPU_ID )->kvm_dirty_regs =0 ; + + run->kvm_dirty_regs =INVALID_SYNC_FIELD |TEST_SYNC_FIELDS ; + rv =_vcpu_run (vm,VCPU_ID ); +TEST_ASSERT (rv <0 && errno ==EINVAL , +"Invalid kvm_dirty_regs did not cause expected KVM_RUN error: %d\n" , + rv); +vcpu_state (vm,VCPU_ID )->kvm_dirty_regs =0 ; +/* Request and verify all valid register sets. */ run->kvm_valid_regs =TEST_SYNC_FIELDS ; rv =_vcpu_run (vm,VCPU_ID );
Quoted 6 lines · On Wed, 4 Sep 2019 09:13:08 +0200 Thomas Huth <[email protected]> wrote:
If unknown bits are set in
kvm_valid_regsorkvm_dirty_regs, this clearly indicates that something went wrong in the KVM userspace application. The x86 variant of KVM already contains a check for bad bits (and the corresponding kselftest checks this), so let's do the same on s390x now, too.
Quoted 6 lines
Signed-off-by Thomas Huth <[email protected]>--- arch/s390/include/uapi/asm/kvm.h | 6 ++++ arch/s390/kvm/kvm-s390.c | 4 +++ .../selftests/kvm/s390x/sync_regs_test.c | 30 +++++++++++++++++++ 3 files changed, 40 insertions(+)
With splitting out the selftest,