From: Sean Christopherson <seanjc@google.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
Zheng Zhang <zheng.zhang@email.ucr.edu>,
Kees Cook <keescook@chromium.org>,
Sean Christopherson <seanjc@google.com>
Subject: [PATCH 7/7] KVM: selftests: Verify stats fd is usable after VM fd has been closed
Date: Tue, 11 Jul 2023 16:01:31 -0700 [thread overview]
Message-ID: <20230711230131.648752-8-seanjc@google.com> (raw)
In-Reply-To: <20230711230131.648752-1-seanjc@google.com>
Verify that VM and vCPU binary stats files are usable even after userspace
has put its last direct reference to the VM. This is a regression test
for a UAF bug where KVM didn't gift the stats files a reference to the VM.
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
tools/testing/selftests/kvm/kvm_binary_stats_test.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/kvm/kvm_binary_stats_test.c b/tools/testing/selftests/kvm/kvm_binary_stats_test.c
index 5317e27b77d0..698c1cfa3111 100644
--- a/tools/testing/selftests/kvm/kvm_binary_stats_test.c
+++ b/tools/testing/selftests/kvm/kvm_binary_stats_test.c
@@ -252,6 +252,14 @@ int main(int argc, char *argv[])
stats_test(vcpu_get_stats_fd(vcpus[i * max_vcpu + j]));
}
+ /*
+ * Close the VM fd and redo the stats tests. KVM should gift a
+ * reference (to the VM) to each stats fd, i.e. stats should
+ * still be accessible even after userspace has put its last
+ * _direct_ reference to the VM.
+ */
+ kvm_vm_free(vms[i]);
+
stats_test(vm_stats_fds);
for (j = 0; j < max_vcpu; ++j)
stats_test(vcpu_stats_fds[j]);
@@ -259,8 +267,6 @@ int main(int argc, char *argv[])
ksft_test_result_pass("vm%i\n", i);
}
- for (i = 0; i < max_vm; ++i)
- kvm_vm_free(vms[i]);
free(vms);
free(vcpus);
free(vcpu_stats_fds);
--
2.41.0.255.g8b1d071c50-goog
next prev parent reply other threads:[~2023-07-11 23:02 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-11 23:01 [PATCH 0/7] KVM: Grab KVM references for stats fds Sean Christopherson
2023-07-11 23:01 ` [PATCH 1/7] KVM: Grab a reference to KVM for VM and vCPU stats file descriptors Sean Christopherson
2023-07-12 20:04 ` Kees Cook
2023-07-11 23:01 ` [PATCH 2/7] KVM: selftests: Use pread() to read binary stats header Sean Christopherson
2023-07-11 23:01 ` [PATCH 3/7] KVM: selftests: Clean up stats fd in common stats_test() helper Sean Christopherson
2023-07-11 23:01 ` [PATCH 4/7] KVM: selftests: Explicitly free vcpus array in binary stats test Sean Christopherson
2023-07-11 23:01 ` [PATCH 5/7] KVM: selftests: Verify userspace can create "redundant" binary stats files Sean Christopherson
2023-07-11 23:01 ` [PATCH 6/7] KVM: selftests: Verify stats fd can be dup()'d and read Sean Christopherson
2023-07-11 23:01 ` Sean Christopherson [this message]
2023-07-26 15:17 ` [PATCH 0/7] KVM: Grab KVM references for stats fds Sean Christopherson
2023-07-29 15:02 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230711230131.648752-8-seanjc@google.com \
--to=seanjc@google.com \
--cc=keescook@chromium.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=zheng.zhang@email.ucr.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox