From: NeilBrown Date: Thu, 21 Jul 2011 18:23:00 +0000 (-0400) Subject: Statd should always 'chdir' to its state directory. X-Git-Tag: nfs-utils-1-2-5-rc1~1 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=1ce0374d445d8a3dbdfb3e9da4c76be9df44666b;p=nfs-utils.git Statd should always 'chdir' to its state directory. s statd can be started by 'mount' which can sometimes be run by a normal user, the current-working-directory could be anything. In partcular it could be in a mounted filesystem. As 'statd' continues running as a daemon it could keep prevent that filesystem from being unmounted. statd does currently 'chdir' to the state directory, but only if the state directory is not owned by root. This is wrong - it should check for root after the chdir, not before. So swap the two if statements around. Signed-off-by: NeilBrown Signed-off-by: Steve Dickson --- diff --git a/support/nsm/file.c b/support/nsm/file.c index 98b47bf..a12c753 100644 --- a/support/nsm/file.c +++ b/support/nsm/file.c @@ -395,18 +395,18 @@ nsm_drop_privileges(const int pidfd) return false; } - if (st.st_uid == 0) { - xlog_warn("Running as root. " - "chown %s to choose different user", nsm_base_dirname); - return true; - } - if (chdir(nsm_base_dirname) == -1) { xlog(L_ERROR, "Failed to change working directory to %s: %m", nsm_base_dirname); return false; } + if (st.st_uid == 0) { + xlog_warn("Running as root. " + "chown %s to choose different user", nsm_base_dirname); + return true; + } + /* * If the pidfile happens to reside on NFS, dropping privileges * will probably cause us to lose access, even though we are