Commit bbeb3406 authored by Huang Ying's avatar Huang Ying Committed by Avi Kivity

KVM: Fix a race condition for usage of is_hwpoison_address()

is_hwpoison_address accesses the page table, so the caller must hold
current->mm->mmap_sem in read mode. So fix its usage in hva_to_pfn of
kvm accordingly.

Comment is_hwpoison_address to remind other users.
Reported-by: default avatarAvi Kivity <avi@redhat.com>
Signed-off-by: default avatarHuang Ying <ying.huang@intel.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 6c3f6041
...@@ -1298,6 +1298,9 @@ int soft_offline_page(struct page *page, int flags) ...@@ -1298,6 +1298,9 @@ int soft_offline_page(struct page *page, int flags)
return ret; return ret;
} }
/*
* The caller must hold current->mm->mmap_sem in read mode.
*/
int is_hwpoison_address(unsigned long addr) int is_hwpoison_address(unsigned long addr)
{ {
pgd_t *pgdp; pgd_t *pgdp;
......
...@@ -947,12 +947,13 @@ static pfn_t hva_to_pfn(struct kvm *kvm, unsigned long addr) ...@@ -947,12 +947,13 @@ static pfn_t hva_to_pfn(struct kvm *kvm, unsigned long addr)
if (unlikely(npages != 1)) { if (unlikely(npages != 1)) {
struct vm_area_struct *vma; struct vm_area_struct *vma;
down_read(&current->mm->mmap_sem);
if (is_hwpoison_address(addr)) { if (is_hwpoison_address(addr)) {
up_read(&current->mm->mmap_sem);
get_page(hwpoison_page); get_page(hwpoison_page);
return page_to_pfn(hwpoison_page); return page_to_pfn(hwpoison_page);
} }
down_read(&current->mm->mmap_sem);
vma = find_vma(current->mm, addr); vma = find_vma(current->mm, addr);
if (vma == NULL || addr < vma->vm_start || if (vma == NULL || addr < vma->vm_start ||
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment