KVM: s390: Limit adapter indicator access to page
Janosch Frank
maintainerv2 cover KVM: s390: Limit adapter indicator access to page
We currently check the address of the indicator fields but not the sum of address and offset. This patch remedies that problem and limits the address + offset combination to a single page.
The selftest is very rudimentary but it's a start.
v2:
Reworked KVM limit check.
Changed good-case test to subtract 4 bits instead of 8. That should ensure that we catch the error I made in v1.
Janosch Frank (2):
KVM: s390: Limit adapter indicator access to mapped page
KVM: s390: selftests: Add IRQ routing address offset tests
arch/s390/kvm/interrupt.c | 12 +++ tools/testing/selftests/kvm/Makefile.kvm | 1 + .../testing/selftests/kvm/s390/irq_routing.c | 75 +++++++++++++++++++ 3 files changed, 88 insertions(+) create mode 100644 tools/testing/selftests/kvm/s390/irq_routing.c
Signature · 1 line
2.51.0
Janosch Frank
maintainerPATCH v2 1/2 KVM: s390: Limit adapter indicator access to mapped page
While we check the address for errors, we don't seem to check the bit offsets and since they are 32 and 64 bits a lot of memory can be reached indirectly via those offsets.
--- arch/s390/kvm/interrupt.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
arch/s390/kvm/interrupt.c +12 -0
@@ -2724,6 +2724,9 @@ static unsigned long get_ind_bit(__u64 addr, unsigned long bit_nr, bool swap) bit = bit_nr + (addr %PAGE_SIZE ) *8 ; +/* kvm_set_routing_entry() should never allow this to happen */ +WARN_ON_ONCE (bit > (PAGE_SIZE *BITS_PER_BYTE -1 )); +return swap ? (bit ^ (BITS_PER_LONG -1 )) : bit; }
@@ -2852,6 +2855,7 @@ int kvm_set_routing_entry(struct kvm *kvm,struct kvm_kernel_irq_routing_entry *e, const struct kvm_irq_routing_entry *ue) { + const struct kvm_irq_routing_s390_adapter *adapter;u64 uaddr_s, uaddr_i;int idx;
@@ -2862,6 +2866,14 @@ int kvm_set_routing_entry(struct kvm *kvm,return -EINVAL ; e->set = set_adapter_int; + adapter = &ue->u.adapter; +if (adapter->summary_addr + (adapter->summary_offset /8 ) >= + (adapter->summary_addr &PAGE_MASK ) +PAGE_SIZE ) +return -EINVAL ; +if (adapter->ind_addr + (adapter->ind_offset /8 ) >= + (adapter->ind_addr &PAGE_MASK ) +PAGE_SIZE ) +return -EINVAL ; + idx =srcu_read_lock (&kvm->srcu); uaddr_s =gpa_to_hva (kvm, ue->u.adapter.summary_addr); uaddr_i =gpa_to_hva (kvm, ue->u.adapter.ind_addr);
Signature · 1 line
2.51.0
Re: [PATCH v2 1/2] KVM: s390: Limit adapter indicator access to mapped page
Quoted 7 lines · Janosch Frank
While we check the address for errors, we don't seem to check the bit offsets and since they are 32 and 64 bits a lot of memory can be reached indirectly via those offsets.
Signed-off-by Janosch Frank <[email protected]>Fixes 84223598778b ("KVM: s390: irq routing for adapter interrupts.")Suggested-by Claudio Imbrenda <[email protected]>
Quoted 41 lines
--- arch/s390/kvm/interrupt.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)arch/s390/kvm/interrupt.c +12
-0@@ -2724,6 +2724,9 @@ static unsigned long get_ind_bit(__u64 addr, unsigned long bit_nr, bool swap) bit = bit_nr + (addr %PAGE_SIZE ) *8 ; +/* kvm_set_routing_entry() should never allow this to happen */ +WARN_ON_ONCE (bit > (PAGE_SIZE *BITS_PER_BYTE -1 )); +return swap ? (bit ^ (BITS_PER_LONG -1 )) : bit; }@@ -2852,6 +2855,7 @@ int kvm_set_routing_entry(struct kvm *kvm,struct kvm_kernel_irq_routing_entry *e, const struct kvm_irq_routing_entry *ue) { + const struct kvm_irq_routing_s390_adapter *adapter;u64 uaddr_s, uaddr_i;int idx;@@ -2862,6 +2866,14 @@ int kvm_set_routing_entry(struct kvm *kvm,return -EINVAL ; e->set = set_adapter_int; + adapter = &ue->u.adapter; +if (adapter->summary_addr + (adapter->summary_offset /8 ) >= + (adapter->summary_addr &PAGE_MASK ) +PAGE_SIZE ) +return -EINVAL ; +if (adapter->ind_addr + (adapter->ind_offset /8 ) >= + (adapter->ind_addr &PAGE_MASK ) +PAGE_SIZE ) +return -EINVAL ; + idx =srcu_read_lock (&kvm->srcu); uaddr_s =gpa_to_hva (kvm, ue->u.adapter.summary_addr); uaddr_i =gpa_to_hva (kvm, ue->u.adapter.ind_addr);
Matthew Rosato
Tested-byRe: [PATCH v2 1/2] KVM: s390: Limit adapter indicator access to mapped page
Quoted 11 lines · Matthew Rosato
Quoted 7 lines · Janosch Frank
While we check the address for errors, we don't seem to check the bit offsets and since they are 32 and 64 bits a lot of memory can be reached indirectly via those offsets.
Signed-off-by Janosch Frank <[email protected]>Fixes 84223598778b ("KVM: s390: irq routing for adapter interrupts.")Suggested-by Claudio Imbrenda <[email protected]>Reviewed-by Matthew Rosato <[email protected]>
Like with v1, I used a modified QEMU to attempt various invocations to convince myself this works. So feel free to also add:
Janosch Frank
maintainerRe: [PATCH v2 1/2] KVM: s390: Limit adapter indicator access to mapped page
Quoted 10 lines · Matthew Rosato
Quoted 9 lines · Matthew Rosato
Quoted 7 lines · Janosch Frank
While we check the address for errors, we don't seem to check the bit offsets and since they are 32 and 64 bits a lot of memory can be reached indirectly via those offsets.
Signed-off-by Janosch Frank <[email protected]>Fixes 84223598778b ("KVM: s390: irq routing for adapter interrupts.")Suggested-by Claudio Imbrenda <[email protected]>
Quoted 9 lines
Quoted 2 lines
Reviewed-by Matthew Rosato <[email protected]>Like with v1, I used a modified QEMU to attempt various invocations to convince myself this works. So feel free to also add:
Tested-by Matthew Rosato <[email protected]>
Thank you for testing this!
Re: [PATCH v2 1/2] KVM: s390: Limit adapter indicator access to mapped page
In reply to Janosch FrankAm 03.03.26 um 14:46 schrieb Janosch Frank:
Quoted 7 lines
While we check the address for errors, we don't seem to check the bit offsets and since they are 32 and 64 bits a lot of memory can be reached indirectly via those offsets.
Signed-off-by Janosch Frank <[email protected]>Fixes 84223598778b ("KVM: s390: irq routing for adapter interrupts.")Suggested-by Claudio Imbrenda <[email protected]>
Quoted 31 lines
--- arch/s390/kvm/interrupt.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)arch/s390/kvm/interrupt.c +5
-0@@ -2724,6 +2724,9 @@ static unsigned long get_ind_bit(__u64 addr, unsigned long bit_nr, bool swap) bit = bit_nr + (addr %PAGE_SIZE ) *8 ; +/* kvm_set_routing_entry() should never allow this to happen */ +WARN_ON_ONCE (bit > (PAGE_SIZE *BITS_PER_BYTE -1 )); +return swap ? (bit ^ (BITS_PER_LONG -1 )) : bit; }@@ -2852,6 +2855,7 @@ int kvm_set_routing_entry(struct kvm *kvm,struct kvm_kernel_irq_routing_entry *e, const struct kvm_irq_routing_entry *ue) { + const struct kvm_irq_routing_s390_adapter *adapter;u64 uaddr_s, uaddr_i;int idx;@@ -2862,6 +2866,14 @@ int kvm_set_routing_entry(struct kvm *kvm,return -EINVAL ; e->set = set_adapter_int; + adapter = &ue->u.adapter;
arch/s390/kvm/interrupt.c int kvm_set_routing_entry(struct kvm *kvm, · line 2879
Quoted 10 lines
arch/s390/kvm/interrupt.c +7
-0+if (adapter->summary_addr + (adapter->summary_offset /8 ) >= + (adapter->summary_addr &PAGE_MASK ) +PAGE_SIZE ) +return -EINVAL ; +if (adapter->ind_addr + (adapter->ind_offset /8 ) >= + (adapter->ind_addr &PAGE_MASK ) +PAGE_SIZE ) +return -EINVAL ; + idx =srcu_read_lock (&kvm->srcu); uaddr_s =gpa_to_hva (kvm, ue->u.adapter.summary_addr); uaddr_i =gpa_to_hva (kvm, ue->u.adapter.ind_addr);
we could consider a follow-on patch to use the local adapter variable here and below as well. But not as part of this fix.
Janosch Frank
maintainerPATCH v2 2/2 KVM: s390: selftests: Add IRQ routing address offset tests
In reply to Janosch FrankThis test tries to setup routes which have address + offset combinations which cross a page.
--- tools/testing/selftests/kvm/Makefile.kvm | 1 + .../testing/selftests/kvm/s390/irq_routing.c | 75 +++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 tools/testing/selftests/kvm/s390/irq_routing.c
tools/testing/selftests/kvm/Makefile.kvm +1 -0
@@ -205,6 +205,7 @@ TEST_GEN_PROGS_s390 += s390/ucontrol_test TEST_GEN_PROGS_s390 += s390/user_operexec TEST_GEN_PROGS_s390 += s390/keyop TEST_GEN_PROGS_s390 += rseq_test +TEST_GEN_PROGS_s390 += s390/irq_routing TEST_GEN_PROGS_riscv = $(TEST_GEN_PROGS_COMMON) TEST_GEN_PROGS_riscv += riscv/sbi_pmu_test
tools/testing/selftests/kvm/s390/irq_routing.c new file +75 -0
75 lines not on this page · raw message
Signature · 1 line
2.51.0
Re: [PATCH v2 2/2] KVM: s390: selftests: Add IRQ routing address offset tests
Quoted 5 lines · Janosch Frank
This test tries to setup routes which have address + offset combinations which cross a page.
Signed-off-by Janosch Frank <[email protected]>---
LGTM, verified half of these tests fail without the first patch from this series; all pass once it is applied.
Quoted 98 lines
tools/testing/selftests/kvm/Makefile.kvm | 1 + .../testing/selftests/kvm/s390/irq_routing.c | 75 +++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 tools/testing/selftests/kvm/s390/irq_routing.ctools/testing/selftests/kvm/Makefile.kvm +1
-0@@ -205,6 +205,7 @@ TEST_GEN_PROGS_s390 += s390/ucontrol_test TEST_GEN_PROGS_s390 += s390/user_operexec TEST_GEN_PROGS_s390 += s390/keyop TEST_GEN_PROGS_s390 += rseq_test +TEST_GEN_PROGS_s390 += s390/irq_routing TEST_GEN_PROGS_riscv = $(TEST_GEN_PROGS_COMMON) TEST_GEN_PROGS_riscv += riscv/sbi_pmu_testtools/testing/selftests/kvm/s390/irq_routing.c new file +75
-0@@ -0,0 +1,75 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* IRQ routing offset tests. +* +* Copyright IBM Corp. 2026 +* +* Authors: +* Janosch Frank <[email protected]> +*/ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/ioctl.h> + +#include "test_util.h" +#include "kvm_util.h" +#include "kselftest.h" +#include "ucall_common.h" + +extern char guest_code[]; +asm("guest_code:\n" +"diag %r0,%r0,0\n" +"j .\n" ); + +static void test (void ) +{ +struct kvm_irq_routing *routing; +struct kvm_vcpu *vcpu; +struct kvm_vm *vm; +vm_paddr_t mem; +int ret; + +struct kvm_irq_routing_entry ue = { + .type =KVM_IRQ_ROUTING_S390_ADAPTER , + .gsi =1 , + }; + + vm =vm_create_with_one_vcpu (&vcpu, guest_code); + mem =vm_phy_pages_alloc (vm,2 ,4096 *42 ,0 ); + + routing =kvm_gsi_routing_create (); + routing->nr =1 ; + routing->entries[0 ] = ue; + routing->entries[0 ].u.adapter.summary_addr = (uintptr_t )mem; + routing->entries[0 ].u.adapter.ind_addr = (uintptr_t )mem; + + routing->entries[0 ].u.adapter.summary_offset =4096 *8 ; + ret =__vm_ioctl (vm,KVM_SET_GSI_ROUTING , routing); +ksft_test_result (ret ==-1 && errno ==EINVAL ,"summary offset outside of page\n" ); + + routing->entries[0 ].u.adapter.summary_offset -=4 ; + ret =__vm_ioctl (vm,KVM_SET_GSI_ROUTING , routing); +ksft_test_result (ret ==0 ,"summary offset inside of page\n" ); + + routing->entries[0 ].u.adapter.ind_offset =4096 *8 ; + ret =__vm_ioctl (vm,KVM_SET_GSI_ROUTING , routing); +ksft_test_result (ret ==-1 && errno ==EINVAL ,"ind offset outside of page\n" ); + + routing->entries[0 ].u.adapter.ind_offset -=4 ; + ret =__vm_ioctl (vm,KVM_SET_GSI_ROUTING , routing); +ksft_test_result (ret ==0 ,"ind offset inside of page\n" ); + +kvm_vm_free (vm); +} + +int main (int argc,char *argv[]) +{ +TEST_REQUIRE (kvm_has_cap (KVM_CAP_IRQ_ROUTING )); + +ksft_print_header (); +ksft_set_plan (4 ); +test (); + +ksft_finished ();/* Print results and exit() accordingly */ +}
Matthew Rosato
Tested-byRe: [PATCH v2 2/2] KVM: s390: selftests: Add IRQ routing address offset tests
Quoted 4 lines · Matthew Rosato
Quoted 3 lines · Janosch Frank
This test tries to setup routes which have address + offset combinations which cross a page.
Quoted 8 lines
Quoted 2 lines
Signed-off-by Janosch Frank <[email protected]>---
LGTM, verified half of these tests fail without the first patch from this series; all pass once it is applied.
Reviewed-by Matthew Rosato <[email protected]>
As mentioned above I ran tests with a few different kernel builds against this patch, so if you'd like you can also have: