| 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
| ||
|
Message-Id: <1343731376-20658-4-git-send-email-konrad.wilk@oracle.com> Date: Tue, 31 Jul 2012 06:42:56 -0400 From: Konrad Rzeszutek Wilk <konrad.wilk@...cle.com> To: linux-kernel@...r.kernel.org, xen-devel@...ts.xensource.com, Ian.Campbell@...rix.com, hpa@...or.com, x86@...nel.org Cc: Konrad Rzeszutek Wilk <konrad.wilk@...cle.com> Subject: [PATCH 3/3] x86: Let extend_brk return a NULL pointer instead of just BUG_ON. The callers of this function (dmi_alloc) and the various Xen related ones can deal with a NULL pointer. Suggested-by: Ian Campbell <Ian.Campbell@...rix.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@...cle.com> --- arch/x86/kernel/setup.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 16be6dc..13d6c51 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -268,9 +268,10 @@ void * __init extend_brk(size_t size, size_t align) BUG_ON(_brk_start == 0); BUG_ON(align & mask); - _brk_end = (_brk_end + mask) & ~mask; - BUG_ON((char *)(_brk_end + size) > __brk_limit); + if ((char *)(((_brk_end + mask) & ~mask) + size) > __brk_limit) + return NULL; + _brk_end = (_brk_end + mask) & ~mask; ret = (void *)_brk_end; _brk_end += size; -- 1.7.7.6 -- 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