From d59226926e12545489d516777fcf8714800453af Mon Sep 17 00:00:00 2001 From: Boris Fiuczynski Date: Mon, 16 Jan 2017 14:27:33 +0100 Subject: [PATCH] util: add file exists check in virReadFCHost File open errors are prevented by a file exists check before virFileReadAll is called since all callers of the virReadFCHost method handle errors themselves based on the NULL return anyway. Also included is a minor spelling correction in a comment. Signed-off-by: Boris Fiuczynski --- src/util/virutil.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/util/virutil.c b/src/util/virutil.c index aeaa7f98e8..91178d1515 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -2011,7 +2011,7 @@ virGetSCSIHostNameByParentaddr(unsigned int domain, * * Read the value of sysfs "fc_host" entry. * - * Returns result as a stringon success, caller must free @result after + * Returns result as a string on success, caller must free @result after * Otherwise returns NULL. */ char * @@ -2029,6 +2029,9 @@ virReadFCHost(const char *sysfs_prefix, host, entry) < 0) goto cleanup; + if (!virFileExists(sysfs_path)) + goto cleanup; + if (virFileReadAll(sysfs_path, 1024, &buf) < 0) goto cleanup; -- GitLab