open_without_symlink: Don't SYSERROR on something else than ELOOP

The open_without_symlink routine has been specifically created to prevent mounts with synlinks as source or destination. Keep SYSERROR'ing in that particular scenario, but leave error handling to calling functions for the other ones - e.g. optional bind mount when the source dir doesn't exist throws a nasty error. Signed-off-by: Bogdan Purcareata <bogdan.purcareata@nxp.com>

open_without_symlink: Don't SYSERROR on something else than ELOOP
e67458e4 · Christian Brauner · Stéphane Graber · 1ab99317 · e67458e4
Commit e67458e4 authored Mar 23, 2016 by Christian Brauner Committed by Stéphane Graber Nov 17, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

utils.c src/lxc/utils.c +4 -3

No files found.
--- a/src/lxc/utils.c
+++ b/src/lxc/utils.c
@@ -1313,8 +1313,6 @@ static int open_without_symlink(const char *target, const char *prefix_skip)
 			errno = saved_errno;
 			if (errno == ELOOP)
 				SYSERROR("%s in %s was a symbolic link!", nextpath, target);
-			else
-				SYSERROR("Error examining %s in %s", nextpath, target);
 			goto out;
 		}
 	}
@@ -1359,8 +1357,11 @@ int safe_mount(const char *src, const char *dest, const char *fstype,

 	destfd = open_without_symlink(dest, rootfs);
 	if (destfd < 0) {
-		if (srcfd != -1)
+		if (srcfd != -1) {
+			saved_errno = errno;
 			close(srcfd);
+			errno = saved_errno;
+		}
 		return destfd;
 	}