Skip to content

L
lxc
Commit 88e078ba by Christian Brauner
Options

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: 's avatarBogdan Purcareata <bogdan.purcareata@nxp.com>
parent 684753c2
Showing with 4 additions and 3 deletions
src/lxc/utils.c
...@@ -1621,8 +1621,6 @@ static int open_without_symlink(const char *target, const char *prefix_skip) ...@@ -1621,8 +1621,6 @@ static int open_without_symlink(const char *target, const char *prefix_skip)
errno = saved_errno; errno = saved_errno;
if (errno == ELOOP) if (errno == ELOOP)
SYSERROR("%s in %s was a symbolic link!", nextpath, target); SYSERROR("%s in %s was a symbolic link!", nextpath, target);
else
SYSERROR("Error examining %s in %s", nextpath, target);
goto out; goto out;
} }
} }
...@@ -1667,8 +1665,11 @@ int safe_mount(const char *src, const char *dest, const char *fstype, ...@@ -1667,8 +1665,11 @@ int safe_mount(const char *src, const char *dest, const char *fstype,
destfd = open_without_symlink(dest, rootfs); destfd = open_without_symlink(dest, rootfs);
if (destfd < 0) { if (destfd < 0) {
if (srcfd != -1) if (srcfd != -1) {
saved_errno = errno;
close(srcfd); close(srcfd);
errno = saved_errno;
}
return destfd; return destfd;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment