lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 21 Oct 2015 03:05:48 -0700 From: tip-bot for Borislav Petkov <tipbot@...or.com> To: linux-tip-commits@...r.kernel.org Cc: chaowang@...hat.com, jgross@...e.com, msalter@...hat.com, jroedel@...e.de, torvalds@...ux-foundation.org, hpa@...or.com, akpm@...ux-foundation.org, mingo@...nel.org, peterz@...radead.org, bp@...e.de, tglx@...utronix.de, jkosina@...e.cz, luto@...capital.net, linux-kernel@...r.kernel.org, dyoung@...hat.com Subject: [tip:ras/core] x86/setup/crash: Check memblock_reserve() retval Commit-ID: 6f3760570e26eefc214e641b6daeddb7106240bb Gitweb: http://git.kernel.org/tip/6f3760570e26eefc214e641b6daeddb7106240bb Author: Borislav Petkov <bp@...e.de> AuthorDate: Mon, 19 Oct 2015 11:17:46 +0200 Committer: Ingo Molnar <mingo@...nel.org> CommitDate: Wed, 21 Oct 2015 11:10:56 +0200 x86/setup/crash: Check memblock_reserve() retval memblock_reserve() can fail but the crashkernel reservation code doesn't check that and this can lead the user into believing that the crashkernel region was actually reserved. Make sure we check that return value and we exit early with a failure message in the error case. Signed-off-by: Borislav Petkov <bp@...e.de> Reviewed-by: Dave Young <dyoung@...hat.com> Reviewed-by: Joerg Roedel <jroedel@...e.de> Cc: Andrew Morton <akpm@...ux-foundation.org> Cc: Andy Lutomirski <luto@...capital.net> Cc: H. Peter Anvin <hpa@...or.com> Cc: Jiri Kosina <jkosina@...e.cz> Cc: Juergen Gross <jgross@...e.com> Cc: Linus Torvalds <torvalds@...ux-foundation.org> Cc: Mark Salter <msalter@...hat.com> Cc: Peter Zijlstra <peterz@...radead.org> Cc: Thomas Gleixner <tglx@...utronix.de> Cc: WANG Chao <chaowang@...hat.com> Cc: jerry_hoemann@...com Link: http://lkml.kernel.org/r/1445246268-26285-7-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar <mingo@...nel.org> --- arch/x86/kernel/setup.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index d478871..3f75297 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -531,7 +531,11 @@ static int __init reserve_crashkernel_low(void) return -ENOMEM; } - memblock_reserve(low_base, low_size); + ret = memblock_reserve(low_base, low_size); + if (ret) { + pr_err("%s: Error reserving crashkernel low memblock.\n", __func__); + return ret; + } pr_info("Reserving %ldMB of low memory at %ldMB for crashkernel (System low RAM: %ldMB)\n", (unsigned long)(low_size >> 20), @@ -589,7 +593,11 @@ static void __init reserve_crashkernel(void) return; } } - memblock_reserve(crash_base, crash_size); + ret = memblock_reserve(crash_base, crash_size); + if (ret) { + pr_err("%s: Error reserving crashkernel memblock.\n", __func__); + return; + } if (crash_base >= (1ULL << 32) && reserve_crashkernel_low()) { memblock_free(crash_base, crash_size); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists