mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/9p: fix potential leak in v9fs_rreaddir()

Browse Source 
Free allocated directory entries in v9fs_rreaddir() if argument
`entries` was passed as NULL, to avoid a memory leak. It is
explicitly allowed by design for `entries` to be NULL. [1]

[1] https://lore.kernel.org/all/1690923.g4PEXVpXuU@silver

Reported-by: Coverity (CID 1487558)
Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Message-Id: <E1psh5T-0002XN-1C@lizzy.crudebyte.com>
This commit is contained in:
Christian Schoenebeck 2023-04-29 11:25:33 +02:00
parent 1a67e07fe9
commit f91ce58cb2
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/qtest/libqos/virtio-9p-client.c
View File

@ -594,6 +594,8 @@ void v9fs_rreaddir(P9Req *req, uint32_t *count, uint32_t *nentries,
{ {
uint32_t local_count; uint32_t local_count;
struct V9fsDirent *e = NULL; struct V9fsDirent *e = NULL;
/* only used to avoid a leak if entries was NULL */
struct V9fsDirent *unused_entries = NULL;
uint16_t slen; uint16_t slen;
uint32_t n = 0; uint32_t n = 0;
@ -612,6 +614,8 @@ void v9fs_rreaddir(P9Req *req, uint32_t *count, uint32_t *nentries,
e = g_new(struct V9fsDirent, 1); e = g_new(struct V9fsDirent, 1);
if (entries) { if (entries) {
*entries = e; *entries = e;
} else {
unused_entries = e;
} }
} else { } else {
e = e->next = g_new(struct V9fsDirent, 1); e = e->next = g_new(struct V9fsDirent, 1);
@ -628,6 +632,7 @@ void v9fs_rreaddir(P9Req *req, uint32_t *count, uint32_t *nentries,
*nentries = n; *nentries = n;
} }
v9fs_free_dirents(unused_entries);
v9fs_req_free(req); v9fs_req_free(req);
} }