Commit e363d24c authored by Mike Travis's avatar Mike Travis Committed by Ingo Molnar

x86/platform/UV: Fix bug with iounmap() of the UV4 EFI System Table causing a crash

Save the uv_systab::size field before doing the iounmap()
of the struct pointer, to avoid a NULL dereference crash.
Tested-by: default avatarFrank Ramsay <framsay@sgi.com>
Tested-by: default avatarJohn Estabrook <estabrook@sgi.com>
Signed-off-by: default avatarMike Travis <travis@sgi.com>
Reviewed-by: default avatarDimitri Sivanich <sivanich@sgi.com>
Reviewed-by: default avatarNathan Zimmer <nzimmer@sgi.com>
Cc: Alex Thorlton <athorlton@sgi.com>
Cc: Andrew Banman <abanman@sgi.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Russ Anderson <rja@sgi.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20160801184050.250424783@asylum.americas.sgi.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 054f621f
...@@ -199,12 +199,14 @@ void uv_bios_init(void) ...@@ -199,12 +199,14 @@ void uv_bios_init(void)
return; return;
} }
/* Starting with UV4 the UV systab size is variable */
if (uv_systab->revision >= UV_SYSTAB_VERSION_UV4) { if (uv_systab->revision >= UV_SYSTAB_VERSION_UV4) {
int size = uv_systab->size;
iounmap(uv_systab); iounmap(uv_systab);
uv_systab = ioremap(efi.uv_systab, uv_systab->size); uv_systab = ioremap(efi.uv_systab, size);
if (!uv_systab) { if (!uv_systab) {
pr_err("UV: UVsystab: ioremap(%d) failed!\n", pr_err("UV: UVsystab: ioremap(%d) failed!\n", size);
uv_systab->size);
return; return;
} }
} }
......
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