[PATCH 1/2] e2freefrag: fix memory leak in scan_online()

[PATCH 1/2] e2freefrag: fix memory leak in scan_online()

[Lukas Czerner]

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
---
 misc/e2freefrag.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/misc/e2freefrag.c b/misc/e2freefrag.c
index f7fede54..935ae225 100644
--- a/misc/e2freefrag.c
+++ b/misc/e2freefrag.c
@@ -236,6 +236,7 @@ static int scan_online(ext2_filsys fs, struct chunk_info *info,
 		fsmap_advance(fsmap);
 	}
 
+	free(fsmap);
 	return 1;
 }
 #else
-- 
2.20.1

[PATCH 2/2] e2fsprogs: fix potential memory leak in path_append()

[Lukas Czerner]

If realloc() fails in path_append() we will lose a memory pointed to by
target->path. Fix it.

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
---
 misc/create_inode.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/misc/create_inode.c b/misc/create_inode.c
index 05aa6363..cedbba52 100644
--- a/misc/create_inode.c
+++ b/misc/create_inode.c
@@ -704,10 +704,12 @@ struct file_info {
 static errcode_t path_append(struct file_info *target, const char *file)
 {
 	if (strlen(file) + target->path_len + 1 > target->path_max_len) {
+		void *p;
 		target->path_max_len *= 2;
-		target->path = realloc(target->path, target->path_max_len);
-		if (!target->path)
+		p = realloc(target->path, target->path_max_len);
+		if (p == NULL)
 			return EXT2_ET_NO_MEMORY;
+		target->path = p;
 	}
 	target->path_len += sprintf(target->path + target->path_len, "/%s",
 				    file);
-- 
2.20.1

Re: [PATCH 1/2] e2freefrag: fix memory leak in scan_online()

[Theodore Y. Ts'o]

On Tue, Jan 15, 2019 at 02:42:02PM +0100, Lukas Czerner wrote:
> Signed-off-by: Lukas Czerner <lczerner@redhat.com>

Thanks, applied.

					- Ted

Re: [PATCH 2/2] e2fsprogs: fix potential memory leak in path_append()

[Theodore Y. Ts'o]

On Tue, Jan 15, 2019 at 02:42:03PM +0100, Lukas Czerner wrote:
> If realloc() fails in path_append() we will lose a memory pointed to by
> target->path. Fix it.
> 
> Signed-off-by: Lukas Czerner <lczerner@redhat.com>

Thanks, applied.

					- Ted