Skip to content

Commit 156bffd

Browse files
committed
KVM: Add a dedicated API for setting KVM-internal memslots
Add a dedicated API for setting internal memslots, and have it explicitly disallow setting userspace memslots. Setting a userspace memslots without a direct command from userspace would result in all manner of issues. No functional change intended. Cc: Tao Su <tao1.su@linux.intel.com> Cc: Claudio Imbrenda <imbrenda@linux.ibm.com> Cc: Christian Borntraeger <borntraeger@de.ibm.com> Reviewed-by: Xiaoyao Li <xiaoyao.li@intel.com> Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com> Acked-by: Christoph Schlameuss <schlameuss@linux.ibm.com> Link: https://lore.kernel.org/r/20250111002022.1230573-4-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent d131f00 commit 156bffd

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

arch/x86/kvm/x86.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12827,7 +12827,7 @@ void __user * __x86_set_memory_region(struct kvm *kvm, int id, gpa_t gpa,
1282712827
m.guest_phys_addr = gpa;
1282812828
m.userspace_addr = hva;
1282912829
m.memory_size = size;
12830-
r = __kvm_set_memory_region(kvm, &m);
12830+
r = kvm_set_internal_memslot(kvm, &m);
1283112831
if (r < 0)
1283212832
return ERR_PTR_USR(r);
1283312833
}

include/linux/kvm_host.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,8 +1192,8 @@ enum kvm_mr_change {
11921192
KVM_MR_FLAGS_ONLY,
11931193
};
11941194

1195-
int __kvm_set_memory_region(struct kvm *kvm,
1196-
const struct kvm_userspace_memory_region2 *mem);
1195+
int kvm_set_internal_memslot(struct kvm *kvm,
1196+
const struct kvm_userspace_memory_region2 *mem);
11971197
void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *slot);
11981198
void kvm_arch_memslots_updated(struct kvm *kvm, u64 gen);
11991199
int kvm_arch_prepare_memory_region(struct kvm *kvm,

virt/kvm/kvm_main.c

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1926,8 +1926,8 @@ static bool kvm_check_memslot_overlap(struct kvm_memslots *slots, int id,
19261926
return false;
19271927
}
19281928

1929-
int __kvm_set_memory_region(struct kvm *kvm,
1930-
const struct kvm_userspace_memory_region2 *mem)
1929+
static int __kvm_set_memory_region(struct kvm *kvm,
1930+
const struct kvm_userspace_memory_region2 *mem)
19311931
{
19321932
struct kvm_memory_slot *old, *new;
19331933
struct kvm_memslots *slots;
@@ -2050,7 +2050,16 @@ int __kvm_set_memory_region(struct kvm *kvm,
20502050
kfree(new);
20512051
return r;
20522052
}
2053-
EXPORT_SYMBOL_GPL(__kvm_set_memory_region);
2053+
2054+
int kvm_set_internal_memslot(struct kvm *kvm,
2055+
const struct kvm_userspace_memory_region2 *mem)
2056+
{
2057+
if (WARN_ON_ONCE(mem->slot < KVM_USER_MEM_SLOTS))
2058+
return -EINVAL;
2059+
2060+
return __kvm_set_memory_region(kvm, mem);
2061+
}
2062+
EXPORT_SYMBOL_GPL(kvm_set_internal_memslot);
20542063

20552064
static int kvm_vm_ioctl_set_memory_region(struct kvm *kvm,
20562065
struct kvm_userspace_memory_region2 *mem)

0 commit comments

Comments
 (0)