KVM: Protect vcpu->pid dereference via debugfs with RCU
Sean Christopherson
reviewerPATCH 1/1 KVM: Protect vcpu->pid dereference via debugfs with RCU
Wrap the vcpu->pid dereference in the debugfs hook vcpu_get_pid() with proper RCU read (un)lock. Unlike the code in kvm_vcpu_ioctl(), vcpu_get_pid() is not a simple access; the pid pointer is passed to pid_nr() and fully dereferenced if the pointer is non-NULL.
Failure to acquire RCU could result in use-after-free of the old pid if a different task invokes KVM_RUN and puts the last reference to the old vcpu->pid between vcpu_get_pid() reading the pointer and dereferencing it in pid_nr().
--- virt/kvm/kvm_main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
virt/kvm/kvm_main.c +4 -1
@@ -3867,7 +3867,10 @@ static int create_vcpu_fd(struct kvm_vcpu *vcpu)static int vcpu_get_pid (void *data,u64 *val) {struct kvm_vcpu *vcpu = (struct kvm_vcpu *) data; - *val =pid_nr (rcu_access_pointer (vcpu->pid)); + +rcu_read_lock (); + *val =pid_nr (rcu_dereference (vcpu->pid)); +rcu_read_unlock ();return 0 ; }
base-commit: 7cb79f433e75b05d1635aefaa851cfcd1cb7dc4f
Signature · 1 line
2.39.1.581.gbfd45094c4-goog
Quoted 11 lines · Sean Christopherson
Wrap the
vcpu->piddereference in the debugfs hookvcpu_get_pid()with proper RCU read (un)lock. Unlike the code inkvm_vcpu_ioctl(),vcpu_get_pid()is not a simple access; the pid pointer is passed topid_nr()and fully dereferenced if the pointer is non-NULL.Failure to acquire RCU could result in use-after-free of the old pid if a different task invokes
KVM_RUNand puts the last reference to the oldvcpu->pidbetweenvcpu_get_pid()reading the pointer and dereferencing it inpid_nr().[...]
Applied to kvm-x86 generic, thanks!
[1/1] KVM: Protect vcpu->pid dereference via debugfs with RCU
https://github.com/kvm-x86/linux/commit/76021e96d781
--
https://github.com/kvm-x86/linux/tree/next
https://github.com/kvm-x86/linux/tree/fixes