2009-12-14 21:48:12

by Phillip Lougher

Subject: [PATCH 1/3] bzip2/lzma/gzip: pre-boot malloc doesn't return NULL on failure

The trivial malloc implementation used in the pre-boot environment by the
decompressors returns a bad pointer on failure (falling through after
calling error). This is doubly wrong - the callers expect malloc to
return NULL on failure, second the error function is intended to be
used by the decompressors to propagate errors to *their* callers. The
decompressors have no access to any state set by the error function.

Signed-off-by: Phillip Lougher <[email protected]>
---
include/linux/decompress/mm.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
index 12ff8c3..5032b9a 100644
--- a/include/linux/decompress/mm.h
+++ b/include/linux/decompress/mm.h
@@ -25,7 +25,7 @@ static void *malloc(int size)
void *p;

if (size < 0)
- error("Malloc error");
+ return NULL;
if (!malloc_ptr)
malloc_ptr = free_mem_ptr;

@@ -35,7 +35,7 @@ static void *malloc(int size)
malloc_ptr += size;

if (free_mem_end_ptr && malloc_ptr >= free_mem_end_ptr)
- error("Out of memory");
+ return NULL;

malloc_count++;
return p;
--
1.6.3.3

2009-12-15 22:58:19

by Phillip Lougher

Subject: [tip:x86/urgent] bzip2/lzma/gzip: pre-boot malloc doesn't return NULL on failure

Commit-ID: c1e7c3ae59b065bf7ff24a05cb609b2f9e314db6
Gitweb: http://git.kernel.org/tip/c1e7c3ae59b065bf7ff24a05cb609b2f9e314db6
Author: Phillip Lougher <[email protected]>
AuthorDate: Mon, 14 Dec 2009 21:45:19 +0000
Committer: H. Peter Anvin <[email protected]>
CommitDate: Tue, 15 Dec 2009 14:04:12 -0800

bzip2/lzma/gzip: pre-boot malloc doesn't return NULL on failure

The trivial malloc implementation used in the pre-boot environment by the
decompressors returns a bad pointer on failure (falling through after
calling error). This is doubly wrong - the callers expect malloc to
return NULL on failure, second the error function is intended to be
used by the decompressors to propagate errors to *their* callers. The
decompressors have no access to any state set by the error function.

Signed-off-by: Phillip Lougher <[email protected]>
LKML-Reference: <4b26b1ef.hIInb2AYPMtImAJO%[email protected]>
Signed-off-by: H. Peter Anvin <[email protected]>
---
include/linux/decompress/mm.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
index 12ff8c3..5032b9a 100644
--- a/include/linux/decompress/mm.h
+++ b/include/linux/decompress/mm.h
@@ -25,7 +25,7 @@ static void *malloc(int size)
void *p;

if (size < 0)
- error("Malloc error");
+ return NULL;
if (!malloc_ptr)
malloc_ptr = free_mem_ptr;

@@ -35,7 +35,7 @@ static void *malloc(int size)
malloc_ptr += size;

if (free_mem_end_ptr && malloc_ptr >= free_mem_end_ptr)
- error("Out of memory");
+ return NULL;

malloc_count++;
return p;