Blame SOURCES/e2fsprogs-1.45.6-debugfs-fix-memory-leak-problem-in-read_list.patch
|
 |
e427d2 |
From 9221fb77a7187957ed84e45bf6ad6f5e37755e5c Mon Sep 17 00:00:00 2001
|
|
|
e427d2 |
From: Zhiqiang Liu <liuzhiqiang26@huawei.com>
|
|
|
e427d2 |
Date: Sat, 20 Feb 2021 16:41:29 +0800
|
|
|
e427d2 |
Subject: [PATCH 22/46] debugfs: fix memory leak problem in read_list()
|
|
|
e427d2 |
Content-Type: text/plain
|
|
|
e427d2 |
|
|
|
e427d2 |
In read_list func, if strtoull() fails in while loop,
|
|
|
e427d2 |
we will return the error code directly. Then, memory of
|
|
|
e427d2 |
variable lst will be leaked without setting to *list.
|
|
|
e427d2 |
|
|
|
e427d2 |
Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
|
|
|
e427d2 |
Signed-off-by: linfeilong <linfeilong@huawei.com>
|
|
|
e427d2 |
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
|
|
|
e427d2 |
Signed-off-by: Lukas Czerner <lczerner@redhat.com>
|
|
|
e427d2 |
---
|
|
|
e427d2 |
debugfs/util.c | 12 ++++++++----
|
|
|
e427d2 |
1 file changed, 8 insertions(+), 4 deletions(-)
|
|
|
e427d2 |
|
|
|
e427d2 |
diff --git a/debugfs/util.c b/debugfs/util.c
|
|
|
e427d2 |
index bbb20ff6..37620295 100644
|
|
|
e427d2 |
--- a/debugfs/util.c
|
|
|
e427d2 |
+++ b/debugfs/util.c
|
|
|
e427d2 |
@@ -530,12 +530,16 @@ errcode_t read_list(char *str, blk64_t **list, size_t *len)
|
|
|
e427d2 |
|
|
|
e427d2 |
errno = 0;
|
|
|
e427d2 |
y = x = strtoull(tok, &e, 0);
|
|
|
e427d2 |
- if (errno)
|
|
|
e427d2 |
- return errno;
|
|
|
e427d2 |
+ if (errno) {
|
|
|
e427d2 |
+ retval = errno;
|
|
|
e427d2 |
+ break;
|
|
|
e427d2 |
+ }
|
|
|
e427d2 |
if (*e == '-') {
|
|
|
e427d2 |
y = strtoull(e + 1, NULL, 0);
|
|
|
e427d2 |
- if (errno)
|
|
|
e427d2 |
- return errno;
|
|
|
e427d2 |
+ if (errno) {
|
|
|
e427d2 |
+ retval = errno;
|
|
|
e427d2 |
+ break;
|
|
|
e427d2 |
+ }
|
|
|
e427d2 |
} else if (*e != 0) {
|
|
|
e427d2 |
retval = EINVAL;
|
|
|
e427d2 |
break;
|
|
|
e427d2 |
--
|
|
|
e427d2 |
2.35.1
|
|
|
e427d2 |
|