Skip to content

Commit 7fe0578

Browse files
committed
KVM: SVM: Store MSRPM pointer as "void *" instead of "u32 *"
Store KVM's MSRPM pointers as "void *" instead of "u32 *" to guard against directly accessing the bitmaps outside of code that is explicitly written to access the bitmaps with a specific type. Opportunistically use svm_vcpu_free_msrpm() in svm_vcpu_free() instead of open coding an equivalent. Link: https://lore.kernel.org/r/20250610225737.156318-27-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent 5c9c084 commit 7fe0578

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

arch/x86/kvm/svm/nested.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,8 @@ int __init nested_svm_init_msrpm_merge_offsets(void)
277277
static bool nested_svm_merge_msrpm(struct kvm_vcpu *vcpu)
278278
{
279279
struct vcpu_svm *svm = to_svm(vcpu);
280+
u32 *msrpm02 = svm->nested.msrpm;
281+
u32 *msrpm01 = svm->msrpm;
280282
int i;
281283

282284
/*
@@ -311,7 +313,7 @@ static bool nested_svm_merge_msrpm(struct kvm_vcpu *vcpu)
311313
if (kvm_vcpu_read_guest(vcpu, offset, &value, 4))
312314
return false;
313315

314-
svm->nested.msrpm[p] = svm->msrpm[p] | value;
316+
msrpm02[p] = msrpm01[p] | value;
315317
}
316318

317319
svm->nested.force_msr_bitmap_recalc = false;

arch/x86/kvm/svm/svm.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -722,11 +722,11 @@ void svm_enable_intercept_for_msr(struct kvm_vcpu *vcpu, u32 msr, int type)
722722
svm->nested.force_msr_bitmap_recalc = true;
723723
}
724724

725-
u32 *svm_vcpu_alloc_msrpm(void)
725+
void *svm_vcpu_alloc_msrpm(void)
726726
{
727727
unsigned int order = get_order(MSRPM_SIZE);
728728
struct page *pages = alloc_pages(GFP_KERNEL_ACCOUNT, order);
729-
u32 *msrpm;
729+
void *msrpm;
730730

731731
if (!pages)
732732
return NULL;
@@ -799,7 +799,7 @@ void svm_set_x2apic_msr_interception(struct vcpu_svm *svm, bool intercept)
799799
svm->x2avic_msrs_intercepted = intercept;
800800
}
801801

802-
void svm_vcpu_free_msrpm(u32 *msrpm)
802+
void svm_vcpu_free_msrpm(void *msrpm)
803803
{
804804
__free_pages(virt_to_page(msrpm), get_order(MSRPM_SIZE));
805805
}
@@ -1347,7 +1347,7 @@ static void svm_vcpu_free(struct kvm_vcpu *vcpu)
13471347
sev_free_vcpu(vcpu);
13481348

13491349
__free_page(__sme_pa_to_page(svm->vmcb01.pa));
1350-
__free_pages(virt_to_page(svm->msrpm), get_order(MSRPM_SIZE));
1350+
svm_vcpu_free_msrpm(svm->msrpm);
13511351
}
13521352

13531353
#ifdef CONFIG_CPU_MITIGATIONS

arch/x86/kvm/svm/svm.h

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,11 @@ struct svm_nested_state {
186186
u64 vmcb12_gpa;
187187
u64 last_vmcb12_gpa;
188188

189-
/* These are the merged vectors */
190-
u32 *msrpm;
189+
/*
190+
* The MSR permissions map used for vmcb02, which is the merge result
191+
* of vmcb01 and vmcb12
192+
*/
193+
void *msrpm;
191194

192195
/* A VMRUN has started but has not yet been performed, so
193196
* we cannot inject a nested vmexit yet. */
@@ -268,7 +271,7 @@ struct vcpu_svm {
268271
*/
269272
u64 virt_spec_ctrl;
270273

271-
u32 *msrpm;
274+
void *msrpm;
272275

273276
ulong nmi_iret_rip;
274277

@@ -666,8 +669,8 @@ BUILD_SVM_MSR_BITMAP_HELPERS(void, set, __set)
666669
/* svm.c */
667670
extern bool dump_invalid_vmcb;
668671

669-
u32 *svm_vcpu_alloc_msrpm(void);
670-
void svm_vcpu_free_msrpm(u32 *msrpm);
672+
void *svm_vcpu_alloc_msrpm(void);
673+
void svm_vcpu_free_msrpm(void *msrpm);
671674
void svm_copy_lbrs(struct vmcb *to_vmcb, struct vmcb *from_vmcb);
672675
void svm_enable_lbrv(struct kvm_vcpu *vcpu);
673676
void svm_update_lbrv(struct kvm_vcpu *vcpu);

0 commit comments

Comments
 (0)