X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fstatd%2Fsm-notify.c;h=0eb0b09e5cdf28ca70ee7eb4030af634db594833;hp=0090137ae3dfa99b284b33587be5b50fe17754b7;hb=4d53ca0ba7a855df0dea0808d395ee74c482dfb1;hpb=08ed16cab8a460ea56df19b7e27fd663cc96316d

diff --git a/utils/statd/sm-notify.c b/utils/statd/sm-notify.c
index 0090137..0eb0b09 100644
--- a/utils/statd/sm-notify.c
+++ b/utils/statd/sm-notify.c
@@ -22,9 +22,14 @@
 #include <stdarg.h>
 #include <netdb.h>
 #include <errno.h>
+#include <grp.h>
 
 #ifndef BASEDIR
-#define BASEDIR		"/var/lib/nfs"
+# ifdef NFS_STATEDIR
+#  define BASEDIR		NFS_STATEDIR
+# else
+#  define BASEDIR		"/var/lib/nfs"
+# endif
 #endif
 
 #define DEFAULT_SM_STATE_PATH	BASEDIR "/state"
@@ -81,6 +86,7 @@ static void		addr_set_port(nsm_address *, int);
 static int		host_lookup(int, const char *, nsm_address *);
 void			nsm_log(int fac, const char *fmt, ...);
 static int		record_pid();
+static void		drop_privs(void);
 
 static struct nsm_host *	hosts = NULL;
 
@@ -138,12 +144,12 @@ main(int argc, char **argv)
 	if (optind < argc) {
 usage:		fprintf(stderr,
 			"Usage: sm-notify [-dfq] [-m max-retry-minutes] [-p srcport]\n"
-			"            [-P /path/to/state/directory] [-N my_host_name\n");
+			"            [-P /path/to/state/directory] [-v my_host_name]\n");
 		return 1;
 	}
 
 	if (strcmp(_SM_BASE_PATH, BASEDIR) == 0) {
-		if (record_pid() == 0 && force == 0 && opt_update_state == 0)
+		if (record_pid() == 0 && force == 0 && opt_update_state == 1)
 			/* already run, don't try again */
 			exit(0);
 	}
@@ -243,6 +249,8 @@ notify(void)
 	if (opt_max_retry)
 		failtime = time(NULL) + opt_max_retry;
 
+	drop_privs();
+
 	while (hosts) {
 		struct pollfd	pfd;
 		time_t		now = time(NULL);
@@ -705,9 +713,37 @@ static int record_pid()
 
 	snprintf(pid, 20, "%d\n", getpid());
 	fd = open("/var/run/sm-notify.pid", O_CREAT|O_EXCL|O_WRONLY, 0600);
-	if (!fd)
+	if (fd < 0)
 		return 0;
 	write(fd, pid, strlen(pid));
 	close(fd);
 	return 1;
 }
+
+/* Drop privileges to match owner of state-directory
+ * (in case a reply triggers some unknown bug).
+ */
+static void drop_privs(void)
+{
+	struct stat st;
+
+	if (stat(_SM_DIR_PATH, &st) == -1 &&
+	    stat(_SM_BASE_PATH, &st) == -1) {
+		st.st_uid = 0;
+		st.st_gid = 0;
+	}
+
+	if (st.st_uid == 0) {
+		nsm_log(LOG_WARNING,
+			"sm-notify running as root. chown %s to choose different user\n",
+		    _SM_DIR_PATH);
+		return;
+	}
+
+	setgroups(0, NULL);
+	if (setgid(st.st_gid) == -1
+	    || setuid(st.st_uid) == -1) {
+		nsm_log(LOG_ERR, "Fail to drop privileges");
+		exit(1);
+	}
+}