mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 05:35:25 +00:00
qemusecuritytest: Don't call real virFileExists in mock
Calling the real virFileExists in qemusecuritymock.c can cause a
segfault in qemusecuritytest. No segfaults are noticed when calling
access(2) instead of virFileExists.
Fixes: 4ed5ade753
Signed-off-by: Jim Fehlig <jfehlig@suse.com>
This commit is contained in:
parent
4ed5ade753
commit
4b5cc57ed3
@ -66,7 +66,6 @@ static int (*real_close)(int fd);
|
||||
static int (*real_setfilecon_raw)(const char *path, const char *context);
|
||||
static int (*real_getfilecon_raw)(const char *path, char **context);
|
||||
#endif
|
||||
static bool (*real_virFileExists)(const char *file);
|
||||
|
||||
|
||||
/* Global mutex to avoid races */
|
||||
@ -124,7 +123,6 @@ init_syms(void)
|
||||
VIR_MOCK_REAL_INIT(setfilecon_raw);
|
||||
VIR_MOCK_REAL_INIT(getfilecon_raw);
|
||||
#endif
|
||||
VIR_MOCK_REAL_INIT(virFileExists);
|
||||
|
||||
/* Intentionally not calling init_hash() here */
|
||||
}
|
||||
@ -389,7 +387,7 @@ bool virFileExists(const char *path)
|
||||
VIR_LOCK_GUARD lock = virLockGuardLock(&m);
|
||||
|
||||
if (getenv(ENVVAR) == NULL)
|
||||
return real_virFileExists(path);
|
||||
return access(path, F_OK) == 0;
|
||||
|
||||
init_hash();
|
||||
if (virHashHasEntry(chown_paths, path))
|
||||
|
Loading…
Reference in New Issue
Block a user