aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2020-11-09 20:29:04 +0000
committerPeter Maydell <peter.maydell@linaro.org>2020-11-09 20:29:04 +0000
commit43afbbd9fea1b255cc81f5f4bfd0b6a88826c735 (patch)
treefe8e4048b809b3fc5eb3e1c4bb925c2e694b7377
parent2b030ce1ed75e075d35b0d1008a0cacd73624b28 (diff)
parentb1b9ab1c04d560f86d8da3dfca4d8b21de75fee6 (diff)
downloadqemu-43afbbd9fea1b255cc81f5f4bfd0b6a88826c735.zip
qemu-43afbbd9fea1b255cc81f5f4bfd0b6a88826c735.tar.gz
qemu-43afbbd9fea1b255cc81f5f4bfd0b6a88826c735.tar.bz2
Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2020-11-09-tag' into staging
qemu-ga patch queue for hard-freeze * fix leaked DIR* descriptor in guest-get-disks spotted by coverity # gpg: Signature made Mon 09 Nov 2020 20:11:08 GMT # gpg: using RSA key CEACC9E15534EBABB82D3FA03353C9CEF108B584 # gpg: issuer "michael.roth@amd.com" # gpg: Good signature from "Michael Roth <flukshun@gmail.com>" [full] # gpg: aka "Michael Roth <mdroth@utexas.edu>" [full] # gpg: aka "Michael Roth <mdroth@linux.vnet.ibm.com>" [full] # Primary key fingerprint: CEAC C9E1 5534 EBAB B82D 3FA0 3353 C9CE F108 B584 * remotes/mdroth/tags/qga-pull-2020-11-09-tag: qga: fix missing closedir() in qmp_guest_get_disks() Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--qga/commands-posix.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index 3711080..12c1ba5 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -1443,6 +1443,9 @@ GuestDiskInfoList *qmp_guest_get_disks(Error **errp)
get_disk_deps(disk_dir, disk);
ret = get_disk_partitions(ret, de->d_name, disk_dir, dev_name);
}
+
+ closedir(dp);
+
return ret;
}