From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 22 Mar 2012 02:49:04 +0000 (-0400)
Subject: e2fsck: abort if ext2fs_check_desc() returns a memory failure
X-Git-Tag: v1.42.2~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41cec3498f5991c0e44d977d17fe7a85acc7010a;p=thirdparty%2Fe2fsprogs.git

e2fsck: abort if ext2fs_check_desc() returns a memory failure

We were checking for ENOMEM, but in fact if the malloc() fails,
ext2fs_check_desc() will return EXT2_ET_NO_MEMORY.

Addresses-Google-Bug: #6208183

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/e2fsck/unix.c b/e2fsck/unix.c
index 4f73a4bda..59c52ff33 100644
--- a/e2fsck/unix.c
+++ b/e2fsck/unix.c
@@ -1232,7 +1232,7 @@ restart:
 	    ((retval == EXT2_ET_BAD_MAGIC) ||
 	     (retval == EXT2_ET_CORRUPT_SUPERBLOCK) ||
 	     ((retval == 0) && (retval2 = ext2fs_check_desc(fs))))) {
-		if (retval2 == ENOMEM) {
+		if (retval2 == ENOMEM || retval2 == EXT2_ET_NO_MEMORY) {
 			retval = retval2;
 			goto failure;
 		}