diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-10-24 14:17:20 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-10-24 14:17:20 +0300 |
commit | 9babb091e0ec84f7503fde0a2d9a2a16a0f48e3c (patch) | |
tree | 9b6f07288b9ca9d8444414cd7da291d7c4731da7 /arch/x86/kvm/paging_tmpl.h | |
parent | 5cdda5117e125e0dbb020425cc55a4c143c6febc (diff) | |
parent | bb176f67090ca54869fc1262c913aa69d2ede070 (diff) | |
download | linux-9babb091e0ec84f7503fde0a2d9a2a16a0f48e3c.tar.xz |
Merge tag 'v4.14-rc6' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kvm/paging_tmpl.h')
-rw-r--r-- | arch/x86/kvm/paging_tmpl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h index 86b68dc5a649..f18d1f8d332b 100644 --- a/arch/x86/kvm/paging_tmpl.h +++ b/arch/x86/kvm/paging_tmpl.h @@ -334,10 +334,11 @@ retry_walk: --walker->level; index = PT_INDEX(addr, walker->level); - table_gfn = gpte_to_gfn(pte); offset = index * sizeof(pt_element_t); pte_gpa = gfn_to_gpa(table_gfn) + offset; + + BUG_ON(walker->level < 1); walker->table_gfn[walker->level - 1] = table_gfn; walker->pte_gpa[walker->level - 1] = pte_gpa; |