s390x/kvm: clamp stsi 3.2.2 size
PATCH 1/1 s390x/kvm: clamp stsi 3.2.2 size
The stsi 3.2.2 page is being prepared by the kvm module and the size is clamped by the kernel. As the memory is mapped in the guest, another guest VCPU could race and overwrite the count and messing up the move operation. For any out of bound count, fall back to the kernel buffer.
--- target/s390x/kvm/kvm.c | 9 +++++++++ 1 file changed, 9 insertions(+)
target/s390x/kvm/kvm.c +9 -0
@@ -1791,6 +1791,15 @@ static void insert_stsi_3_2_2(S390CPU *cpu, __u64 addr, uint8_t ar) }else if (s390_cpu_virt_mem_read (cpu, addr, ar, &sysib,sizeof (sysib))) {return ; } + +/* +* The memory was filled by the kernel but mapped into the guest. +* If something is fishy, do not touch the buffer. +*/ +if (sysib.count ==0 || sysib.count >ARRAY_SIZE (sysib.ext_names)) { +return ; + } +/* Shift the stack of Extended Names to prepare for our own data */ memmove (&sysib.ext_names[1 ], &sysib.ext_names[0 ],sizeof (sysib.ext_names[0 ]) * (sysib.count -1 ));
Signature · 1 line
2.53.0
Quoted 10 lines · Christian Borntraeger
The stsi 3.2.2 page is being prepared by the kvm module and the size is clamped by the kernel. As the memory is mapped in the guest, another guest VCPU could race and overwrite the count and messing up the move operation. For any out of bound count, fall back to the kernel buffer.
Signed-off-by Christian Borntraeger <[email protected]>--- target/s390x/kvm/kvm.c | 9 +++++++++ 1 file changed, 9 insertions(+)
Looks right to me.
Quoted 21 lines
target/s390x/kvm/kvm.c +9
-0@@ -1791,6 +1791,15 @@ static void insert_stsi_3_2_2(S390CPU *cpu, __u64 addr, uint8_t ar) }else if (s390_cpu_virt_mem_read (cpu, addr, ar, &sysib,sizeof (sysib))) {return ; } + +/* +* The memory was filled by the kernel but mapped into the guest. +* If something is fishy, do not touch the buffer. +*/ +if (sysib.count ==0 || sysib.count >ARRAY_SIZE (sysib.ext_names)) { +return ; + } +/* Shift the stack of Extended Names to prepare for our own data */ memmove (&sysib.ext_names[1 ], &sysib.ext_names[0 ],sizeof (sysib.ext_names[0 ]) * (sysib.count -1 ));
Cornelia Huck
AppliedQuoted 10 lines · Christian Borntraeger
The stsi 3.2.2 page is being prepared by the kvm module and the size is clamped by the kernel. As the memory is mapped in the guest, another guest VCPU could race and overwrite the count and messing up the move operation. For any out of bound count, fall back to the kernel buffer.
Signed-off-by Christian Borntraeger <[email protected]>--- target/s390x/kvm/kvm.c | 9 +++++++++ 1 file changed, 9 insertions(+)
Thanks, applied.