KVM: s390: Fix two bugs
Claudio Imbrenda
maintainercover KVM: s390: Fix two bugs
This small series fixes two bugs in s390 KVM. One is small and trivial, the other is pretty bad.
* The wrong type of flag was being passed to vcpu_dat_fault_handler(); it expects a FOLL_* flag, but a FAULT_FLAG_* was passed instead.
* Due to incorrect usage of mmu_notifier_register(), in some rare cases when running a secure guest, the struct mm for the userspace process would get freed too early and cause a use-after-free.
Claudio Imbrenda (2):
KVM: s390: Fix incorrect usage of mmu_notifier_register()
KVM: s390: Fix FOLL_*/FAULT_FLAG_* confusion
arch/s390/kvm/kvm-s390.c | 8 ++++---- arch/s390/kvm/pv.c | 14 +++++++++----- 2 files changed, 13 insertions(+), 9 deletions(-)
Signature · 1 line
2.50.1
Claudio Imbrenda
maintainerPATCH 1/2 KVM: s390: Fix incorrect usage of mmu_notifier_register()
If mmu_notifier_register() fails, for example because a signal was pending, the mmu_notifier will not be registered. But when the VM gets destroyed, it will get unregistered anyway and that will cause one extra mmdrop(), which will eventually cause the mm of the process to be freed too early, and cause a use-after free.
This bug happens rarely, and only when secure guests are involved.
The solution is to check the return value of mmu_notifier_register() and return it to the caller (ultimately it will be propagated all the way to userspace). In case of -EINTR, userspace will try again.
--- arch/s390/kvm/pv.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
arch/s390/kvm/pv.c +9 -5
@@ -622,6 +622,15 @@ int kvm_s390_pv_init_vm(struct kvm *kvm, u16 *rc, u16 *rrc)int cc, ret;u16 dummy; +/* Add the notifier only once. No races because we hold kvm->lock */ +if (kvm->arch.pv.mmu_notifier.ops != &kvm_s390_pv_mmu_notifier_ops) { + ret =mmu_notifier_register (&kvm->arch.pv.mmu_notifier, kvm->mm); +if (ret) +return ret; +/* The notifier will be unregistered when the VM is destroyed */ + kvm->arch.pv.mmu_notifier.ops = &kvm_s390_pv_mmu_notifier_ops; + } + ret =kvm_s390_pv_alloc_vm (kvm);if (ret)return ret;
@@ -657,11 +666,6 @@ int kvm_s390_pv_init_vm(struct kvm *kvm, u16 *rc, u16 *rrc)return -EIO ; } kvm->arch.gmap->guest_handle = uvcb.guest_handle; -/* Add the notifier only once. No races because we hold kvm->lock */ -if (kvm->arch.pv.mmu_notifier.ops != &kvm_s390_pv_mmu_notifier_ops) { - kvm->arch.pv.mmu_notifier.ops = &kvm_s390_pv_mmu_notifier_ops; -mmu_notifier_register (&kvm->arch.pv.mmu_notifier, kvm->mm); - }return 0 ; }
Signature · 1 line
2.50.1
Re: [PATCH v1 1/2] KVM: s390: Fix incorrect usage of mmu_notifier_register()
Am 05.08.25 um 13:14 schrieb Claudio Imbrenda:
Quoted 6 lines
If
mmu_notifier_register()fails, for example because a signal was pending, themmu_notifierwill not be registered. But when the VM gets destroyed, it will get unregistered anyway and that will cause one extrammdrop(), which will eventually cause the mm of the process to be freed too early, and cause a use-after free.
Quoted 8 lines
This bug happens rarely, and only when secure guests are involved.
The solution is to check the return value of
mmu_notifier_register()and return it to the caller (ultimately it will be propagated all the way to userspace). In case of-EINTR, userspace will try again.Fixes ca2fd0609b5d ("KVM: s390: pv: add mmu_notifier")Signed-off-by Claudio Imbrenda <[email protected]>
Quoted 36 lines
--- arch/s390/kvm/pv.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)arch/s390/kvm/pv.c +9
-5@@ -622,6 +622,15 @@ int kvm_s390_pv_init_vm(struct kvm *kvm, u16 *rc, u16 *rrc)int cc, ret;u16 dummy; +/* Add the notifier only once. No races because we hold kvm->lock */ +if (kvm->arch.pv.mmu_notifier.ops != &kvm_s390_pv_mmu_notifier_ops) { + ret =mmu_notifier_register (&kvm->arch.pv.mmu_notifier, kvm->mm); +if (ret) +return ret; +/* The notifier will be unregistered when the VM is destroyed */ + kvm->arch.pv.mmu_notifier.ops = &kvm_s390_pv_mmu_notifier_ops; + } + ret =kvm_s390_pv_alloc_vm (kvm);if (ret)return ret;@@ -657,11 +666,6 @@ int kvm_s390_pv_init_vm(struct kvm *kvm, u16 *rc, u16 *rrc)return -EIO ; } kvm->arch.gmap->guest_handle = uvcb.guest_handle; -/* Add the notifier only once. No races because we hold kvm->lock */ -if (kvm->arch.pv.mmu_notifier.ops != &kvm_s390_pv_mmu_notifier_ops) { - kvm->arch.pv.mmu_notifier.ops = &kvm_s390_pv_mmu_notifier_ops; -mmu_notifier_register (&kvm->arch.pv.mmu_notifier, kvm->mm); - }return 0 ; }
Re: [PATCH v1 1/2] KVM: s390: Fix incorrect usage of mmu_notifier_register()
In reply to Claudio ImbrendaQuoted 8 lines · Claudio Imbrenda
If
mmu_notifier_register()fails, for example because a signal was pending, themmu_notifierwill not be registered. But when the VM gets destroyed, it will get unregistered anyway and that will cause one extrammdrop(), which will eventually cause the mm of the process to be freed too early, and cause a use-after free.This bug happens rarely, and only when secure guests are involved.
Quoted 7 lines
The solution is to check the return value of
mmu_notifier_register()and return it to the caller (ultimately it will be propagated all the way to userspace). In case of-EINTR, userspace will try again.Fixes ca2fd0609b5d ("KVM: s390: pv: add mmu_notifier")Signed-off-by Claudio Imbrenda <[email protected]>---
Signature · 3 lines
Cheers, David / dhildenb
Re: [PATCH v1 1/2] KVM: s390: Fix incorrect usage of mmu_notifier_register()
In reply to Claudio ImbrendaQuoted 6 lines · Claudio Imbrenda
If
mmu_notifier_register()fails, for example because a signal was pending, themmu_notifierwill not be registered. But when the VM gets destroyed, it will get unregistered anyway and that will cause one extrammdrop(), which will eventually cause the mm of the process to be freed too early, and cause a use-after free.
Quoted 8 lines
This bug happens rarely, and only when secure guests are involved.
The solution is to check the return value of
mmu_notifier_register()and return it to the caller (ultimately it will be propagated all the way to userspace). In case of-EINTR, userspace will try again.Fixes ca2fd0609b5d ("KVM: s390: pv: add mmu_notifier")Signed-off-by Claudio Imbrenda <[email protected]>
Re: [PATCH v1 1/2] KVM: s390: Fix incorrect usage of mmu_notifier_register()
In reply to Claudio ImbrendaQuoted 6 lines · Claudio Imbrenda
If
mmu_notifier_register()fails, for example because a signal was pending, themmu_notifierwill not be registered. But when the VM gets destroyed, it will get unregistered anyway and that will cause one extrammdrop(), which will eventually cause the mm of the process to be freed too early, and cause a use-after free.
Quoted 8 lines
This bug happens rarely, and only when secure guests are involved.
The solution is to check the return value of
mmu_notifier_register()and return it to the caller (ultimately it will be propagated all the way to userspace). In case of-EINTR, userspace will try again.Fixes ca2fd0609b5d ("KVM: s390: pv: add mmu_notifier")Signed-off-by Claudio Imbrenda <[email protected]>
Quoted 36 lines
--- arch/s390/kvm/pv.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)arch/s390/kvm/pv.c +9
-5@@ -622,6 +622,15 @@ int kvm_s390_pv_init_vm(struct kvm *kvm, u16 *rc, u16 *rrc)int cc, ret;u16 dummy; +/* Add the notifier only once. No races because we hold kvm->lock */ +if (kvm->arch.pv.mmu_notifier.ops != &kvm_s390_pv_mmu_notifier_ops) { + ret =mmu_notifier_register (&kvm->arch.pv.mmu_notifier, kvm->mm); +if (ret) +return ret; +/* The notifier will be unregistered when the VM is destroyed */ + kvm->arch.pv.mmu_notifier.ops = &kvm_s390_pv_mmu_notifier_ops; + } + ret =kvm_s390_pv_alloc_vm (kvm);if (ret)return ret;@@ -657,11 +666,6 @@ int kvm_s390_pv_init_vm(struct kvm *kvm, u16 *rc, u16 *rrc)return -EIO ; } kvm->arch.gmap->guest_handle = uvcb.guest_handle; -/* Add the notifier only once. No races because we hold kvm->lock */ -if (kvm->arch.pv.mmu_notifier.ops != &kvm_s390_pv_mmu_notifier_ops) { - kvm->arch.pv.mmu_notifier.ops = &kvm_s390_pv_mmu_notifier_ops; -mmu_notifier_register (&kvm->arch.pv.mmu_notifier, kvm->mm); - }return 0 ; }
Claudio Imbrenda
maintainerPATCH 2/2 KVM: s390: Fix FOLL_*/FAULT_FLAG_* confusion
In reply to Claudio ImbrendaPass the right type of flag to vcpu_dat_fault_handler(); it expects a FOLL_* flag (in particular FOLL_WRITE), but FAULT_FLAG_WRITE is passed instead.
This still works because they happen to have the same integer value, but it's a mistake, thus the fix.
--- arch/s390/kvm/kvm-s390.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/s390/kvm/kvm-s390.c +4 -4
@@ -4954,13 +4954,13 @@ static int vcpu_dat_fault_handler(struct kvm_vcpu *vcpu, unsigned long gaddr, unstatic int vcpu_post_run_handle_fault (struct kvm_vcpu *vcpu) { -unsigned int flags =0 ; +unsigned int foll =0 ;unsigned long gaddr;int rc; gaddr = current->thread.gmap_teid.addr *PAGE_SIZE ;if (kvm_s390_cur_gmap_fault_is_write ()) - flags =FAULT_FLAG_WRITE ; + foll =FOLL_WRITE ;switch (current->thread.gmap_int_code &PGM_INT_CODE_MASK ) {case 0 :
@@ -5002,7 +5002,7 @@ static int vcpu_post_run_handle_fault(struct kvm_vcpu *vcpu)send_sig (SIGSEGV , current,0 );if (rc != -ENXIO )break ; - flags =FAULT_FLAG_WRITE ; + foll =FOLL_WRITE ; fallthrough;case PGM_PROTECTION :case PGM_SEGMENT_TRANSLATION :
@@ -5012,7 +5012,7 @@ static int vcpu_post_run_handle_fault(struct kvm_vcpu *vcpu)case PGM_REGION_SECOND_TRANS :case PGM_REGION_THIRD_TRANS :kvm_s390_assert_primary_as (vcpu); -return vcpu_dat_fault_handler (vcpu, gaddr, flags); +return vcpu_dat_fault_handler (vcpu, gaddr, foll);default :KVM_BUG (1 , vcpu->kvm,"Unexpected program interrupt 0x%x, TEID 0x%016lx" , current->thread.gmap_int_code, current->thread.gmap_teid.val);
Signature · 1 line
2.50.1
Re: [PATCH v1 2/2] KVM: s390: Fix FOLL_*/FAULT_FLAG_* confusion
Am 05.08.25 um 13:14 schrieb Claudio Imbrenda:
Quoted 9 lines
Pass the right type of flag to
vcpu_dat_fault_handler(); it expects a FOLL_* flag (in particularFOLL_WRITE), butFAULT_FLAG_WRITEis passed instead.This still works because they happen to have the same integer value, but it's a mistake, thus the fix.
Signed-off-by Claudio Imbrenda <[email protected]>Fixes 05066cafa925 ("s390/mm/fault: Handle guest-related program interrupts in KVM")
Shouldnt we rename the parameter to __kvm_s390_handle_dat_fault and vcpu_dat_fault_handler from flags to foll as well in their implementation and prototypes to keep this consistent?
Quoted 42 lines
--- arch/s390/kvm/kvm-s390.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)arch/s390/kvm/kvm-s390.c +4
-4@@ -4954,13 +4954,13 @@ static int vcpu_dat_fault_handler(struct kvm_vcpu *vcpu, unsigned long gaddr, unstatic int vcpu_post_run_handle_fault (struct kvm_vcpu *vcpu) { -unsigned int flags =0 ; +unsigned int foll =0 ;unsigned long gaddr;int rc; gaddr = current->thread.gmap_teid.addr *PAGE_SIZE ;if (kvm_s390_cur_gmap_fault_is_write ()) - flags =FAULT_FLAG_WRITE ; + foll =FOLL_WRITE ;switch (current->thread.gmap_int_code &PGM_INT_CODE_MASK ) {case 0 :@@ -5002,7 +5002,7 @@ static int vcpu_post_run_handle_fault(struct kvm_vcpu *vcpu)send_sig (SIGSEGV , current,0 );if (rc != -ENXIO )break ; - flags =FAULT_FLAG_WRITE ; + foll =FOLL_WRITE ; fallthrough;case PGM_PROTECTION :case PGM_SEGMENT_TRANSLATION :@@ -5012,7 +5012,7 @@ static int vcpu_post_run_handle_fault(struct kvm_vcpu *vcpu)case PGM_REGION_SECOND_TRANS :case PGM_REGION_THIRD_TRANS :kvm_s390_assert_primary_as (vcpu); -return vcpu_dat_fault_handler (vcpu, gaddr, flags); +return vcpu_dat_fault_handler (vcpu, gaddr, foll);default :KVM_BUG (1 , vcpu->kvm,"Unexpected program interrupt 0x%x, TEID 0x%016lx" , current->thread.gmap_int_code, current->thread.gmap_teid.val);
Claudio Imbrenda
maintainerRe: [PATCH v1 2/2] KVM: s390: Fix FOLL_*/FAULT_FLAG_* confusion
Quoted 8 lines · On Tue, 5 Aug 2025 13:44:04 +0200 Christian Borntraeger…
Am 05.08.25 um 13:14 schrieb Claudio Imbrenda:
Quoted 7 lines
Pass the right type of flag to
vcpu_dat_fault_handler(); it expects a FOLL_* flag (in particularFOLL_WRITE), butFAULT_FLAG_WRITEis passed instead.This still works because they happen to have the same integer value, but it's a mistake, thus the fix.
Quoted 8 lines
Quoted 2 lines
Signed-off-by Claudio Imbrenda <[email protected]>Fixes 05066cafa925 ("s390/mm/fault: Handle guest-related program interrupts in KVM")Shouldnt we rename the parameter to
__kvm_s390_handle_dat_faultandvcpu_dat_fault_handlerfrom flags to foll as well in their implementation and prototypes to keep this consistent?
that's a fair point
a patch in an upcoming series will do that, but I guess I can move that change here instead.
I'll send a v2 later on today
Quoted 44 lines
Quoted 43 lines
--- arch/s390/kvm/kvm-s390.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)arch/s390/kvm/kvm-s390.c +4
-4@@ -4954,13 +4954,13 @@ static int vcpu_dat_fault_handler(struct kvm_vcpu *vcpu, unsigned long gaddr, unstatic int vcpu_post_run_handle_fault (struct kvm_vcpu *vcpu) { -unsigned int flags =0 ; +unsigned int foll =0 ;unsigned long gaddr;int rc; gaddr = current->thread.gmap_teid.addr *PAGE_SIZE ;if (kvm_s390_cur_gmap_fault_is_write ()) - flags =FAULT_FLAG_WRITE ; + foll =FOLL_WRITE ;switch (current->thread.gmap_int_code &PGM_INT_CODE_MASK ) {case 0 :@@ -5002,7 +5002,7 @@ static int vcpu_post_run_handle_fault(struct kvm_vcpu *vcpu)send_sig (SIGSEGV , current,0 );if (rc != -ENXIO )break ; - flags =FAULT_FLAG_WRITE ; + foll =FOLL_WRITE ; fallthrough;case PGM_PROTECTION :case PGM_SEGMENT_TRANSLATION :@@ -5012,7 +5012,7 @@ static int vcpu_post_run_handle_fault(struct kvm_vcpu *vcpu)case PGM_REGION_SECOND_TRANS :case PGM_REGION_THIRD_TRANS :kvm_s390_assert_primary_as (vcpu); -return vcpu_dat_fault_handler (vcpu, gaddr, flags); +return vcpu_dat_fault_handler (vcpu, gaddr, foll);default :KVM_BUG (1 , vcpu->kvm,"Unexpected program interrupt 0x%x, TEID 0x%016lx" , current->thread.gmap_int_code, current->thread.gmap_teid.val);
Re: [PATCH v1 2/2] KVM: s390: Fix FOLL_*/FAULT_FLAG_* confusion
In reply to Claudio ImbrendaQuoted 10 lines · Claudio Imbrenda
Pass the right type of flag to
vcpu_dat_fault_handler(); it expects a FOLL_* flag (in particularFOLL_WRITE), butFAULT_FLAG_WRITEis passed instead.This still works because they happen to have the same integer value, but it's a mistake, thus the fix.
Signed-off-by Claudio Imbrenda <[email protected]>Fixes 05066cafa925 ("s390/mm/fault: Handle guest-related program interrupts in KVM")---
Signature · 3 lines
Cheers, David / dhildenb