coverity: #1435200

Resource leak Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

coverity: #1435200
205fc010 · Christian Brauner · c1768f3f · 205fc010
Unverified Commit 205fc010 authored Apr 29, 2018 by Christian Brauner
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 8 deletions

conf.c src/lxc/conf.c +4 -8

No files found.
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -562,10 +562,6 @@ int pin_rootfs(const char *rootfs)
 	if (!realpath(rootfs, absrootfs))
 		return -2;

-	ret = access(absrootfs, F_OK);
-	if (ret != 0)
-		return -1;
-
 	ret = stat(absrootfs, &s);
 	if (ret < 0)
 		return -1;
@@ -581,12 +577,12 @@ int pin_rootfs(const char *rootfs)
 	if (fd < 0)
 		return fd;

-	if (fstatfs (fd, &sfs)) {
-		return -1;
-	}
+	ret = fstatfs (fd, &sfs);
+	if (ret < 0)
+		return fd;

 	if (sfs.f_type == NFS_SUPER_MAGIC) {
-		DEBUG("rootfs on NFS, not unlinking pin file \"%s\".", absrootfspin);
+		DEBUG("Rootfs on NFS, not unlinking pin file \"%s\"", absrootfspin);
 		return fd;
 	}