[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 09/18] vl: fix direct firmware directories leak
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v3 09/18] vl: fix direct firmware directories leak |
Date: |
Thu, 4 Jan 2018 17:05:14 +0100 |
Note that data_dir[] will now point to allocated strings.
Fixes:
Direct leak of 16 byte(s) in 1 object(s) allocated from:
#0 0x7f1448181850 in malloc (/lib64/libasan.so.4+0xde850)
#1 0x7f1446ed8f0c in g_malloc ../glib/gmem.c:94
#2 0x7f1446ed91cf in g_malloc_n ../glib/gmem.c:331
#3 0x7f1446ef739a in g_strsplit ../glib/gstrfuncs.c:2364
#4 0x55cf276439d7 in main /home/elmarco/src/qq/vl.c:4311
#5 0x7f143dfad039 in __libc_start_main (/lib64/libc.so.6+0x21039)
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
vl.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/vl.c b/vl.c
index d3a5c5d021..8430b0c731 100644
--- a/vl.c
+++ b/vl.c
@@ -2318,7 +2318,7 @@ static void qemu_add_data_dir(const char *path)
return; /* duplicate */
}
}
- data_dir[data_dir_idx++] = path;
+ data_dir[data_dir_idx++] = g_strdup(path);
}
static inline bool nonempty_str(const char *str)
@@ -3079,7 +3079,7 @@ int main(int argc, char **argv, char **envp)
Error *main_loop_err = NULL;
Error *err = NULL;
bool list_data_dirs = false;
- char **dirs;
+ char *dir, **dirs;
typedef struct BlockdevOptions_queue {
BlockdevOptions *bdo;
Location loc;
@@ -4263,9 +4263,12 @@ int main(int argc, char **argv, char **envp)
for (i = 0; dirs[i] != NULL; i++) {
qemu_add_data_dir(dirs[i]);
}
+ g_strfreev(dirs);
/* try to find datadir relative to the executable path */
- qemu_add_data_dir(os_find_datadir());
+ dir = os_find_datadir();
+ qemu_add_data_dir(dir);
+ g_free(dir);
/* add the datadir specified when building */
qemu_add_data_dir(CONFIG_QEMU_DATADIR);
--
2.15.1.355.g36791d7216
- Re: [Qemu-devel] [PATCH v3 03/18] build-sys: add a rule to print a variable, (continued)
- [Qemu-devel] [PATCH v3 04/18] build-sys: compile with -Og or -O1 when --enable-debug, Marc-André Lureau, 2018/01/04
- [Qemu-devel] [PATCH v3 05/18] tests/docker: add some sanitizers to fedora dockerfile, Marc-André Lureau, 2018/01/04
- [Qemu-devel] [PATCH v3 06/18] tests/docker: add test-debug, Marc-André Lureau, 2018/01/04
- [Qemu-devel] [PATCH v3 07/18] build-sys: add some sanitizers when --enable-debug if possible, Marc-André Lureau, 2018/01/04
- [Qemu-devel] [PATCH v3 08/18] tests: fix check-qobject leak, Marc-André Lureau, 2018/01/04
- [Qemu-devel] [PATCH v3 09/18] vl: fix direct firmware directories leak,
Marc-André Lureau <=
- [Qemu-devel] [PATCH v3 10/18] readline: add a free function, Marc-André Lureau, 2018/01/04
- [Qemu-devel] [PATCH v3 11/18] tests: fix migration-test leak, Marc-André Lureau, 2018/01/04
- [Qemu-devel] [PATCH v3 12/18] crypto: fix stack-buffer-overflow error, Marc-André Lureau, 2018/01/04
- [Qemu-devel] [PATCH v3 13/18] qemu-config: fix leak in query-command-line-options, Marc-André Lureau, 2018/01/04
- [Qemu-devel] [PATCH v3 14/18] tests: fix qmp-test leak, Marc-André Lureau, 2018/01/04
- [Qemu-devel] [PATCH v3 15/18] ucontext: annotate coroutine stack for ASAN, Marc-André Lureau, 2018/01/04