Skip to content

KVM: nSVM: avoid TOC/TOU race when checking vmcb12

Emanuele Giuseppe Esposito kvm lkml 5 versions – Applied

Status from this message: Queued (for 5.17). I changed the helper functions to have a "__" prefix since that's more common in Linux.

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v5 Latest7 patches 7 repliesApplied
  2. v47 patches 1 replySuperseded
  3. v38 patches 10 repliesSuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v24 patches2 repliesSuperseded
v1 RFC3 patches14 repliesSuperseded

Changes in v5 from the cover letter

* rebased on kvm/queue branch

Patches in v5 Applied

#Subject and filesSizeRepliesApplied
1/7KVM: nSVM: move nested_vmcb_check_cr3_cr4 logic in nested_vmcb_valid_sregsarch/x86/kvm/svm/nested.c+13 -220 replies
2/7nSVM: introduce smv->nested.save to cache save area fieldsarch/x86/kvm/svm/nested.c arch/x86/kvm/svm/svm.c arch/x86/kvm/svm/svm.h+43 -13 replies
3/7nSVM: rename nested_load_control_from_vmcb12 in nested_copy_vmcb_control_to_cachearch/x86/kvm/svm/nested.c arch/x86/kvm/svm/svm.c arch/x86/kvm/svm/svm.h+43 -431 reply
4/7nSVM: use vmcb_save_area_cached in nested_vmcb_valid_sregs()arch/x86/kvm/svm/nested.c+14 -41 reply
5/7nSVM: use svm->nested.save to load vmcb12 registers and avoid TOC/TOU racesarch/x86/kvm/svm/nested.c+6 -180 replies
6/7nSVM: introduce struct vmcb_ctrl_area_cachedarch/x86/kvm/svm/nested.c arch/x86/kvm/svm/svm.h+65 -00 replies
7/7nSVM: use vmcb_ctrl_area_cached instead of vmcb_control_area in struct svm_nested_statearch/x86/kvm/svm/nested.c arch/x86/kvm/svm/svm.c arch/x86/kvm/svm/svm.h+37 -231 reply

Reviews trailers per patch

6 of 7 patches have a Reviewed-by or Acked-by.

PatchMaxim Levitsky
1/7R-b
2/7R-b
3/7R-b
4/7R-b
5/7R-b
6/7R-b
7/7

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v5 thread

Cover letter [PATCH v5 0/7] KVM: nSVM: avoid TOC/TOU race when checking vmcb12

Currently there is a TOC/TOU race between the check of vmcb12's efer, cr0 and cr4 registers and the later save of their values in svm_set_*, because the guest could modify the values in the meanwhile.

To solve this issue, this series introduces and uses svm->nested.save structure in enter_svm_guest_mode to save the current value of efer, cr0 and cr4 and later use these to set the vcpu->arch.* state.

Similarly, svm->nested.ctl contains fields that are not used, so having a full vmcb_control_area means passing uninitialized fields.

Patches 1,3 and 8 take care of renaming and refactoring code. Patches 2 and 6 introduce respectively vmcb_ctrl_area_cached and vmcb_save_area_cached.
Patches 4 and 5 use vmcb_save_area_cached to avoid TOC/TOU, and patch 7 uses vmcb_ctrl_area_cached.

---
v5:
* rebased on kvm/queue branch

v4:
* introduce _* helpers (_nested_vmcb_check_save, _nested_copy_vmcb_control_to_cache, _nested_copy_vmcb_save_to_cache) that take care of additional parameters.
* svm_set_nested_state: introduce {save, ctl}_cached variables
to not pollute svm->nested.{save,ctl} state, especially if the check fails. remove also unnecessary memset added in previous versions.
* svm_get_nested_state: change stack variable ctl introduced in this series into a pointer that will be zeroed and freed after it has been copied to user

v3:
* merge this series with "KVM: nSVM: use vmcb_ctrl_area_cached instead of vmcb_control_area in nested state"
* rename "nested_load_save_from_vmcb12" in "nested_copy_vmcb_save_to_cache"
* rename "nested_load_control_from_vmcb12" in "nested_copy_vmcb_control_to_cache"
* change check functions (nested_vmcb_valid_sregs and nested_vmcb_valid_sregs) to accept only the vcpu parameter, since we only check
nested state now
* rename "vmcb_is_intercept_cached" in "vmcb12_is_intercept"
and duplicate the implementation instead of calling vmcb_is_intercept

v2:
* svm->nested.save is a separate struct vmcb_save_area_cached, and not vmcb_save_area.
* update also vmcb02->cr3 with svm->nested.save.cr3

RFC:
* use svm->nested.save instead of local variables.
* not dependent anymore from "KVM: nSVM: remove useless kvm_clear_*_queue"
* simplified patches, we just use the struct and not move the check nearer to the TOU.

Emanuele Giuseppe Esposito (7):
KVM: nSVM: move nested_vmcb_check_cr3_cr4 logic in
nested_vmcb_valid_sregs
nSVM: introduce smv->nested.save to cache save area fields
nSVM: rename nested_load_control_from_vmcb12 in
nested_copy_vmcb_control_to_cache
nSVM: use vmcb_save_area_cached in nested_vmcb_valid_sregs()
nSVM: use svm->nested.save to load vmcb12 registers and avoid TOC/TOU
races
nSVM: introduce struct vmcb_ctrl_area_cached
nSVM: use vmcb_ctrl_area_cached instead of vmcb_control_area in struct
svm_nested_state

 arch/x86/kvm/svm/nested.c | 250 ++++++++++++++++++++++++--------------
 arch/x86/kvm/svm/svm.c    |   7 +-
 arch/x86/kvm/svm/svm.h    |  59 ++++++++-
 3 files changed, 213 insertions(+), 103 deletions(-)
Signature · 1 line
2.27.0