Some paths will not be restored. Because we can't possibly know
if they are still in use or not. Reflect this in the test so that
we can test more domains. Also see next commit for more detailed
explanation.
Signed-off-by: Michal Privoznik <mpriv...@redhat.com>
---
tests/qemusecuritymock.c | 44 ++++++++++++++++++++++++++++++++--------
tests/qemusecuritytest.c | 2 +-
tests/qemusecuritytest.h | 2 +-
3 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/tests/qemusecuritymock.c b/tests/qemusecuritymock.c
index e219a9f023..2a9095e1bf 100644
--- a/tests/qemusecuritymock.c
+++ b/tests/qemusecuritymock.c
@@ -353,20 +353,28 @@ int virFileUnlock(int fd ATTRIBUTE_UNUSED,
}
+typedef struct _checkOwnerData checkOwnerData;
+struct _checkOwnerData {
+ const char **paths;
+ bool chown_fail;
+};
+
+
static int
checkOwner(void *payload,
const void *name,
- void *data)
+ void *opaque)
{
- bool *chown_fail = data;
+ checkOwnerData *data = opaque;
uint32_t owner = *((uint32_t*) payload);
- if (owner % 16 != DEFAULT_UID ||
- owner >> 16 != DEFAULT_GID) {
+ if ((owner % 16 != DEFAULT_UID ||
+ owner >> 16 != DEFAULT_GID) &&
+ !virStringListHasString(data->paths, name)) {
fprintf(stderr,
"Path %s wasn't restored back to its original owner\n",
(const char *) name);
- *chown_fail = true;
+ data->chown_fail = true;
}
return 0;
@@ -391,22 +399,40 @@ printXATTR(void *payload,
}
-int checkPaths(void)
+/**
+ * checkPaths:
+ * @paths: a NULL terminated list of paths expected not to be restored
+ *
+ * Check if all paths were restored and if no XATTR was left
+ * behind. Since restore is not done on all domain's paths, some
+ * paths are expected to be not restored. A list of such paths
+ * can be passed in @paths argument. If a path is not restored
+ * but it's on the list no error is indicated.
+ */
+int checkPaths(const char **paths)
{
int ret = -1;
- bool chown_fail = false;
+ checkOwnerData data = { .paths = paths, .chown_fail = false };
bool xattr_fail = false;
+ size_t i;
virMutexLock(&m);
init_hash();
- if ((virHashForEach(chown_paths, checkOwner, &chown_fail)) < 0)
+ for (i = 0; paths && paths[i]; i++) {
+ if (!virHashLookup(chown_paths, paths[i])) {
+ fprintf(stderr, "Unexpected path restored: %s\n", paths[i]);
+ goto cleanup;
+ }
+ }
+
+ if ((virHashForEach(chown_paths, checkOwner, &data)) < 0)
goto cleanup;
if ((virHashForEach(xattr_paths, printXATTR, &xattr_fail)) < 0)
goto cleanup;
- if (chown_fail || xattr_fail)
+ if (data.chown_fail || xattr_fail)
goto cleanup;
ret = 0;
diff --git a/tests/qemusecuritytest.c b/tests/qemusecuritytest.c
index 86347f8625..65e08b4503 100644
--- a/tests/qemusecuritytest.c
+++ b/tests/qemusecuritytest.c
@@ -100,7 +100,7 @@ testDomain(const void *opaque)
qemuSecurityRestoreAllLabel(data->driver, vm, false);
- if (checkPaths() < 0)
+ if (checkPaths(NULL) < 0)
goto cleanup;
ret = 0;
diff --git a/tests/qemusecuritytest.h b/tests/qemusecuritytest.h
index 29c6a9c998..b76277a6d5 100644
--- a/tests/qemusecuritytest.h
+++ b/tests/qemusecuritytest.h
@@ -21,7 +21,7 @@
# define ENVVAR "LIBVIRT_QEMU_SECURITY_TEST"
-extern int checkPaths(void);
+extern int checkPaths(const char **paths);
extern void freePaths(void);
--
2.21.0
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
