mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2024-11-24 12:34:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

hypervisor: kvm: KVM_GET_MSRS writes to its parameter

Browse source 
The KVM code that retrieves MSRs was using ioctl_with_ref(), which is
supposed to have a read-only reference, but KVM_GET_MSRS needs to write
via the provided reference.

Change-Id: I2f0972463c99d7d97f19834d23040ab49bbee20d
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5847468
Reviewed-by: Frederick Mayle <fmayle@google.com>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-by: Elie Kheirallah <khei@google.com>
This commit is contained in:
Daniel Verkamp 2024-09-09 12:49:33 -07:00 committed by crosvm LUCI
parent 019717c04e
commit 364b340472
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hypervisor/src/kvm/x86_64.rs
View file

@ -869,7 +869,7 @@ impl VcpuX86_64 for KvmVcpu {
let ret = { let ret = {
// SAFETY: // SAFETY:
// Here we trust the kernel not to read or write past the end of the kvm_msrs struct. // Here we trust the kernel not to read or write past the end of the kvm_msrs struct.
unsafe { ioctl_with_ref(self, KVM_GET_MSRS, &msrs[0]) } unsafe { ioctl_with_mut_ref(self, KVM_GET_MSRS, &mut msrs[0]) }
}; };
if ret < 0 { if ret < 0 {
return errno_result(); return errno_result();
@ -909,7 +909,7 @@ impl VcpuX86_64 for KvmVcpu {
let ret = { let ret = {
// SAFETY: // SAFETY:
// Here we trust the kernel not to read or write past the end of the kvm_msrs struct. // Here we trust the kernel not to read or write past the end of the kvm_msrs struct.
unsafe { ioctl_with_ref(self, KVM_GET_MSRS, &kvm_msrs[0]) } unsafe { ioctl_with_mut_ref(self, KVM_GET_MSRS, &mut kvm_msrs[0]) }
}; };
if ret < 0 { if ret < 0 {
return errno_result(); return errno_result();

2
kvm/src/lib.rs
View file

@ -1355,7 +1355,7 @@ impl Vcpu {
let ret = { let ret = {
// SAFETY: // SAFETY:
// Here we trust the kernel not to read or write past the end of the kvm_msrs struct. // Here we trust the kernel not to read or write past the end of the kvm_msrs struct.
unsafe { ioctl_with_ref(self, KVM_GET_MSRS, &msrs[0]) } unsafe { ioctl_with_mut_ref(self, KVM_GET_MSRS, &mut msrs[0]) }
}; };
if ret < 0 { if ret < 0 {
// KVM_SET_MSRS actually returns the number of msr entries written. // KVM_SET_MSRS actually returns the number of msr entries written.