xen: use correct end address of kernel for conflict checking

When running as a Xen PV dom0 the kernel is loaded by the hypervisor
using a different memory map than that of the host. In order to
minimize the required changes in the kernel, the kernel adapts its
memory map to that of the host. In order to do that it is checking
for conflicts of its load address with the host memory map.

Unfortunately the tested memory range does not include the .brk
area, which might result in crashes or memory corruption when this
area does conflict with the memory map of the host.

Fix the test by using the _end label instead of __bss_stop.

Fixes: 808fdb71936c ("xen: check for kernel memory conflicting with memory layout")
Signed-off-by: Juergen Gross <jgross@suse.com>
Tested-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
Signed-off-by: Juergen Gross <jgross@suse.com>

diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index 806ddb2391d9bd942dfe56d19a1b995e4a5d9168..4bcc70a71b7d4062a79d76d5ede42cc668cb0c0e 100644 (file)
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -825,7 +825,7 @@ char * __init xen_memory_setup(void)
         * to relocating (and even reusing) pages with kernel text or data.
         */
        if (xen_is_e820_reserved(__pa_symbol(_text),
-                       __pa_symbol(__bss_stop) - __pa_symbol(_text))) {
+                                __pa_symbol(_end) - __pa_symbol(_text))) {
                xen_raw_console_write("Xen hypervisor allocated kernel memory conflicts with E820 map\n");
                BUG();
        }