[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 09/18] qga: Fix guest-get-fsinfo error API violations
From: |
Markus Armbruster |
Subject: |
[PATCH v2 09/18] qga: Fix guest-get-fsinfo error API violations |
Date: |
Wed, 4 Dec 2019 10:36:16 +0100 |
build_guest_fsinfo_for_virtual_device() dereferences @errp when
build_guest_fsinfo_for_device() fails. That's wrong; see the big
comment in error.h. Introduced in commit 46d4c5723e "qga: Add
guest-get-fsinfo command".
No caller actually passes null.
Fix anyway: splice in a local Error *err, and error_propagate().
Cc: Michael Roth <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
qga/commands-posix.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index 1c1a165dae..0be527ccb8 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -1049,6 +1049,7 @@ static void build_guest_fsinfo_for_virtual_device(char
const *syspath,
GuestFilesystemInfo *fs,
Error **errp)
{
+ Error *err = NULL;
DIR *dir;
char *dirpath;
struct dirent *entry;
@@ -1078,10 +1079,11 @@ static void build_guest_fsinfo_for_virtual_device(char
const *syspath,
g_debug(" slave device '%s'", entry->d_name);
path = g_strdup_printf("%s/slaves/%s", syspath, entry->d_name);
- build_guest_fsinfo_for_device(path, fs, errp);
+ build_guest_fsinfo_for_device(path, fs, &err);
g_free(path);
- if (*errp) {
+ if (err) {
+ error_propagate(errp, err);
break;
}
}
--
2.21.0
- [PATCH v2 00/18] Error handling fixes, Markus Armbruster, 2019/12/04
- [PATCH v2 09/18] qga: Fix guest-get-fsinfo error API violations,
Markus Armbruster <=
- [PATCH v2 02/18] crypto: Fix typo in QCryptoTLSSession's <example> comment, Markus Armbruster, 2019/12/04
- [PATCH v2 04/18] tests: Clean up initialization of Error *err variables, Markus Armbruster, 2019/12/04
- [PATCH v2 11/18] s390x/event-facility: Fix realize() error API violations, Markus Armbruster, 2019/12/04
- [PATCH v2 13/18] s390x/cpumodel: Fix realize() error API violations, Markus Armbruster, 2019/12/04
- [PATCH v2 08/18] hw/ipmi: Fix realize() error API violations, Markus Armbruster, 2019/12/04
- [PATCH v2 05/18] exec: Fix file_ram_alloc() error API violations, Markus Armbruster, 2019/12/04