lkml.org 
[lkml]   [2007]   [Sep]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 001/104] KVM: Fix *nopage() in kvm_main.c
    Date
    From: Nguyen Anh Quynh <aquynh@gmail.com>

    *nopage() in kvm_main.c should only store the type of mmap() fault if
    the pointers are not NULL. This patch fixes the problem.

    Signed-off-by: Nguyen Anh Quynh <aquynh@gmail.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>
    ---
    drivers/kvm/kvm_main.c | 8 ++++++--
    1 files changed, 6 insertions(+), 2 deletions(-)

    diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
    index cd05579..36a458f 100644
    --- a/drivers/kvm/kvm_main.c
    +++ b/drivers/kvm/kvm_main.c
    @@ -2285,7 +2285,6 @@ static struct page *kvm_vcpu_nopage(struct vm_area_struct *vma,
    unsigned long pgoff;
    struct page *page;

    - *type = VM_FAULT_MINOR;
    pgoff = ((address - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;
    if (pgoff == 0)
    page = virt_to_page(vcpu->run);
    @@ -2294,6 +2293,9 @@ static struct page *kvm_vcpu_nopage(struct vm_area_struct *vma,
    else
    return NOPAGE_SIGBUS;
    get_page(page);
    + if (type != NULL)
    + *type = VM_FAULT_MINOR;
    +
    return page;
    }

    @@ -2768,12 +2770,14 @@ static struct page *kvm_vm_nopage(struct vm_area_struct *vma,
    unsigned long pgoff;
    struct page *page;

    - *type = VM_FAULT_MINOR;
    pgoff = ((address - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;
    page = gfn_to_page(kvm, pgoff);
    if (!page)
    return NOPAGE_SIGBUS;
    get_page(page);
    + if (type != NULL)
    + *type = VM_FAULT_MINOR;
    +
    return page;
    }

    --
    1.5.3
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-09-17 10:35    [W:0.021 / U:30.556 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site