diff options
| author | David Vrabel | 2014-01-06 12:55:13 +0100 |
|---|---|---|
| committer | David Vrabel | 2014-05-15 17:13:23 +0200 |
| commit | a9b5bff66b2a63f7d0f42434f5da9024b442159c (patch) | |
| tree | cbb48a2c20b256abb44fbe157b98c2981dffa546 /arch/x86/xen/p2m.c | |
| parent | x86/xen: rename early_p2m_alloc() and early_p2m_alloc_middle() (diff) | |
| download | kernel-qcow2-linux-a9b5bff66b2a63f7d0f42434f5da9024b442159c.tar.gz kernel-qcow2-linux-a9b5bff66b2a63f7d0f42434f5da9024b442159c.tar.xz kernel-qcow2-linux-a9b5bff66b2a63f7d0f42434f5da9024b442159c.zip | |
x86/xen: fix set_phys_range_identity() if pfn_e > MAX_P2M_PFN
Allow set_phys_range_identity() to work with a range that overlaps
MAX_P2M_PFN by clamping pfn_e to MAX_P2M_PFN.
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tested-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'arch/x86/xen/p2m.c')
| -rw-r--r-- | arch/x86/xen/p2m.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/xen/p2m.c b/arch/x86/xen/p2m.c index 4fc71cc1705b..82c8c9305510 100644 --- a/arch/x86/xen/p2m.c +++ b/arch/x86/xen/p2m.c @@ -774,7 +774,7 @@ unsigned long __init set_phys_range_identity(unsigned long pfn_s, { unsigned long pfn; - if (unlikely(pfn_s >= MAX_P2M_PFN || pfn_e >= MAX_P2M_PFN)) + if (unlikely(pfn_s >= MAX_P2M_PFN)) return 0; if (unlikely(xen_feature(XENFEAT_auto_translated_physmap))) @@ -783,6 +783,9 @@ unsigned long __init set_phys_range_identity(unsigned long pfn_s, if (pfn_s > pfn_e) return 0; + if (pfn_e > MAX_P2M_PFN) + pfn_e = MAX_P2M_PFN; + for (pfn = (pfn_s & ~(P2M_MID_PER_PAGE * P2M_PER_PAGE - 1)); pfn < ALIGN(pfn_e, (P2M_MID_PER_PAGE * P2M_PER_PAGE)); pfn += P2M_MID_PER_PAGE * P2M_PER_PAGE) |