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 4f73a4bdaecd98dd445ba840c6e52264b4b9c7d1..59c52ff33d8b76fb270eefeb730b227c3413d07a 100644 (file)
--- 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;
                }