From: Wang Shilong <wshilong@ddn.com>
Date: Tue, 26 Nov 2019 09:03:58 +0000 (+0900)
Subject: e2fsck: fix to return ENOMEM in alloc_size_dir()
X-Git-Tag: v1.45.5~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=927ebc78a26cf7d7be09cd0b181c4a11a7a62590;p=thirdparty%2Fe2fsprogs.git

e2fsck: fix to return ENOMEM in alloc_size_dir()

Two memory allocation return check is missed.

Signed-off-by: Wang Shilong <wshilong@ddn.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/e2fsck/rehash.c b/e2fsck/rehash.c
index 2c908be04..392cfe9f1 100644
--- a/e2fsck/rehash.c
+++ b/e2fsck/rehash.c
@@ -276,7 +276,11 @@ static errcode_t alloc_size_dir(ext2_filsys fs, struct out_dir *outdir,
 		outdir->hashes = new_mem;
 	} else {
 		outdir->buf = malloc(blocks * fs->blocksize);
+		if (!outdir->buf)
+			return ENOMEM;
 		outdir->hashes = malloc(blocks * sizeof(ext2_dirhash_t));
+		if (!outdir->hashes)
+			return ENOMEM;
 		outdir->num = 0;
 	}
 	outdir->max = blocks;