| Message ID | 87vavqilre.fsf@notabene.neil.brown.name (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 11/14/2016 02:05 AM, NeilBrown wrote: > rpcbind can save state in a file to allow restart without forgetting > about running services. > > The default location is currently "/tmp" which is > not ideal for system files. It is particularly unpleasant > to put simple files there rather than creating a directory > to contain them. > > On a modern Linux system it is preferable to use /run, and there it is > even more consistent with practice to use a subdirectory. > > This directory needs to be create one each boot, and while there are > tools (e.g. systemd-tmpfiles) which can do that it is cleaner to keep > rpcbind self-contained and have it create the directory. > > So change the default location to /tmp/rpcbind, and create that > directory. If a different user-id is used, we need to create > and chown the directory before dropping privileges. We do this > with care so avoid chowning the wrong thing by mistake. > > Signed-off-by: NeilBrown <neilb@suse.com> > --- > > hi, > I realized that I hadn't allowed for the fact that rpcbind changes > it's uid, and we need to mkdir and chown before that. > I've also reverted the move to /run, but moved to /tmp/rpcbind > instead. A subdirectory is a good idea, even in /tmp. I'm beginning to think put these files into a directory call /tmp/rpcbind is not a good idea... Because if something in /tmp is called rpcbind (like a debugging binary ;-) ) the mkdirs will silently fail which is not good. Here is what I would like to do. Move the directory into /run then create the /run/rpcbind when it does not exist... I think that should play nicely in both the systemd worlds and non-systemd worlds Thoughts? steved. > > NeilBrown > > > configure.ac | 4 ++-- > src/rpcbind.c | 5 +++++ > src/rpcbind.h | 1 + > src/warmstart.c | 25 +++++++++++++++++++++---- > 4 files changed, 29 insertions(+), 6 deletions(-) > > diff --git a/configure.ac b/configure.ac > index f84921eb27fb..df931c720f93 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -22,8 +22,8 @@ AC_ARG_ENABLE([warmstarts], > AM_CONDITIONAL(WARMSTART, test x$enable_warmstarts = xyes) > > AC_ARG_WITH([statedir], > - AS_HELP_STRING([--with-statedir=ARG], [use ARG as state dir @<:@default=/tmp@:>@]) > - ,, [with_statedir=/tmp]) > + AS_HELP_STRING([--with-statedir=ARG], [use ARG as state dir @<:@default=/tmp/rpcbind@:>@]) > + ,, [with_statedir=/tmp/rpcbind]) > AC_SUBST([statedir], [$with_statedir]) > > AC_ARG_WITH([rpcuser], > diff --git a/src/rpcbind.c b/src/rpcbind.c > index 87ccdc27e4c9..8db8dfc17c27 100644 > --- a/src/rpcbind.c > +++ b/src/rpcbind.c > @@ -263,6 +263,11 @@ main(int argc, char *argv[]) > syslog(LOG_ERR, "cannot get uid of '%s': %m", id); > exit(1); > } > +#ifdef WARMSTART > + if (warmstart) { > + mkdir_warmstart(p->pw_uid); > + } > +#endif > if (setgid(p->pw_gid) == -1) { > syslog(LOG_ERR, "setgid to '%s' (%d) failed: %m", id, p->pw_gid); > exit(1); > diff --git a/src/rpcbind.h b/src/rpcbind.h > index 74f9591ae720..5b1a9bb8651a 100644 > --- a/src/rpcbind.h > +++ b/src/rpcbind.h > @@ -129,6 +129,7 @@ int is_localroot(struct netbuf *); > extern void pmap_service(struct svc_req *, SVCXPRT *); > #endif > > +void mkdir_warmstart(int uid); > void write_warmstart(void); > void read_warmstart(void); > > diff --git a/src/warmstart.c b/src/warmstart.c > index 122a058b7954..3a6bcb5e34e1 100644 > --- a/src/warmstart.c > +++ b/src/warmstart.c > @@ -45,19 +45,23 @@ > #include <syslog.h> > #include <unistd.h> > #include <errno.h> > +#include <fcntl.h> > > #include "rpcbind.h" > > -#ifndef RPCBIND_STATEDIR > -#define RPCBIND_STATEDIR "/tmp" > -#endif > - > /* These files keep the pmap_list and rpcb_list in XDR format */ > #define RPCBFILE RPCBIND_STATEDIR "/rpcbind.xdr" > #ifdef PORTMAP > #define PMAPFILE RPCBIND_STATEDIR "/portmap.xdr" > #endif > > +#ifndef O_DIRECTORY > +#define O_DIRECTORY 0 > +#endif > +#ifndef O_NOFOLLOW > +#define O_NOFOLLOW 0 > +#endif > + > static bool_t write_struct(char *, xdrproc_t, void *); > static bool_t read_struct(char *, xdrproc_t, void *); > > @@ -139,8 +143,21 @@ error: > } > > void > +mkdir_warmstart(int uid) > +{ > + if (mkdir(RPCBIND_STATEDIR, 0770) == 0) { > + int fd = open(RPCBIND_STATEDIR, O_RDONLY | O_DIRECTORY | O_NOFOLLOW); > + if (fd >= 0) { > + fchown(fd, uid, -1); > + close(fd); > + } > + } > +} > + > +void > write_warmstart() > { > + (void) mkdir(RPCBIND_STATEDIR, 0770); > (void) write_struct(RPCBFILE, (xdrproc_t)xdr_rpcblist_ptr, &list_rbl); > #ifdef PORTMAP > (void) write_struct(PMAPFILE, (xdrproc_t)xdr_pmaplist_ptr, &list_pml); -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Nov 16 2016, Steve Dickson wrote: > On 11/14/2016 02:05 AM, NeilBrown wrote: >> rpcbind can save state in a file to allow restart without forgetting >> about running services. >> >> The default location is currently "/tmp" which is >> not ideal for system files. It is particularly unpleasant >> to put simple files there rather than creating a directory >> to contain them. >> >> On a modern Linux system it is preferable to use /run, and there it is >> even more consistent with practice to use a subdirectory. >> >> This directory needs to be create one each boot, and while there are >> tools (e.g. systemd-tmpfiles) which can do that it is cleaner to keep >> rpcbind self-contained and have it create the directory. >> >> So change the default location to /tmp/rpcbind, and create that >> directory. If a different user-id is used, we need to create >> and chown the directory before dropping privileges. We do this >> with care so avoid chowning the wrong thing by mistake. >> >> Signed-off-by: NeilBrown <neilb@suse.com> >> --- >> >> hi, >> I realized that I hadn't allowed for the fact that rpcbind changes >> it's uid, and we need to mkdir and chown before that. >> I've also reverted the move to /run, but moved to /tmp/rpcbind >> instead. A subdirectory is a good idea, even in /tmp. > I'm beginning to think put these files into a directory call /tmp/rpcbind > is not a good idea... Because if something in /tmp is called rpcbind (like a > debugging binary ;-) ) the mkdirs will silently fail which is not good. > > Here is what I would like to do. > > Move the directory into /run then create the /run/rpcbind when it > does not exist... I think that should play nicely in both the > systemd worlds and non-systemd worlds > > Thoughts? /var/run rather than /run seems to be a safer universal default. Linux distros can run ./configure --with-statedir=/run/rcpbind Otherwise, I think we are in agreement. You want I should respin with /tmp/rpcbind -> /var/run/rpcbind ?? Thanks, NeilBrown
On 11/15/2016 08:34 PM, NeilBrown wrote: > On Wed, Nov 16 2016, Steve Dickson wrote: > >> On 11/14/2016 02:05 AM, NeilBrown wrote: >>> rpcbind can save state in a file to allow restart without forgetting >>> about running services. >>> >>> The default location is currently "/tmp" which is >>> not ideal for system files. It is particularly unpleasant >>> to put simple files there rather than creating a directory >>> to contain them. >>> >>> On a modern Linux system it is preferable to use /run, and there it is >>> even more consistent with practice to use a subdirectory. >>> >>> This directory needs to be create one each boot, and while there are >>> tools (e.g. systemd-tmpfiles) which can do that it is cleaner to keep >>> rpcbind self-contained and have it create the directory. >>> >>> So change the default location to /tmp/rpcbind, and create that >>> directory. If a different user-id is used, we need to create >>> and chown the directory before dropping privileges. We do this >>> with care so avoid chowning the wrong thing by mistake. >>> >>> Signed-off-by: NeilBrown <neilb@suse.com> >>> --- >>> >>> hi, >>> I realized that I hadn't allowed for the fact that rpcbind changes >>> it's uid, and we need to mkdir and chown before that. >>> I've also reverted the move to /run, but moved to /tmp/rpcbind >>> instead. A subdirectory is a good idea, even in /tmp. >> I'm beginning to think put these files into a directory call /tmp/rpcbind >> is not a good idea... Because if something in /tmp is called rpcbind (like a >> debugging binary ;-) ) the mkdirs will silently fail which is not good. >> >> Here is what I would like to do. >> >> Move the directory into /run then create the /run/rpcbind when it >> does not exist... I think that should play nicely in both the >> systemd worlds and non-systemd worlds >> >> Thoughts? > /var/run rather than /run seems to be a safer universal default. > Linux distros can run ./configure --with-statedir=/run/rcpbind Fair enough... I can roll with that. > > Otherwise, I think we are in agreement. > > You want I should respin with /tmp/rpcbind -> /var/run/rpcbind ?? Sure... thanks! steved. > > Thanks, > NeilBrown -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/configure.ac b/configure.ac index f84921eb27fb..df931c720f93 100644 --- a/configure.ac +++ b/configure.ac @@ -22,8 +22,8 @@ AC_ARG_ENABLE([warmstarts], AM_CONDITIONAL(WARMSTART, test x$enable_warmstarts = xyes) AC_ARG_WITH([statedir], - AS_HELP_STRING([--with-statedir=ARG], [use ARG as state dir @<:@default=/tmp@:>@]) - ,, [with_statedir=/tmp]) + AS_HELP_STRING([--with-statedir=ARG], [use ARG as state dir @<:@default=/tmp/rpcbind@:>@]) + ,, [with_statedir=/tmp/rpcbind]) AC_SUBST([statedir], [$with_statedir]) AC_ARG_WITH([rpcuser], diff --git a/src/rpcbind.c b/src/rpcbind.c index 87ccdc27e4c9..8db8dfc17c27 100644 --- a/src/rpcbind.c +++ b/src/rpcbind.c @@ -263,6 +263,11 @@ main(int argc, char *argv[]) syslog(LOG_ERR, "cannot get uid of '%s': %m", id); exit(1); } +#ifdef WARMSTART + if (warmstart) { + mkdir_warmstart(p->pw_uid); + } +#endif if (setgid(p->pw_gid) == -1) { syslog(LOG_ERR, "setgid to '%s' (%d) failed: %m", id, p->pw_gid); exit(1); diff --git a/src/rpcbind.h b/src/rpcbind.h index 74f9591ae720..5b1a9bb8651a 100644 --- a/src/rpcbind.h +++ b/src/rpcbind.h @@ -129,6 +129,7 @@ int is_localroot(struct netbuf *); extern void pmap_service(struct svc_req *, SVCXPRT *); #endif +void mkdir_warmstart(int uid); void write_warmstart(void); void read_warmstart(void); diff --git a/src/warmstart.c b/src/warmstart.c index 122a058b7954..3a6bcb5e34e1 100644 --- a/src/warmstart.c +++ b/src/warmstart.c @@ -45,19 +45,23 @@ #include <syslog.h> #include <unistd.h> #include <errno.h> +#include <fcntl.h> #include "rpcbind.h" -#ifndef RPCBIND_STATEDIR -#define RPCBIND_STATEDIR "/tmp" -#endif - /* These files keep the pmap_list and rpcb_list in XDR format */ #define RPCBFILE RPCBIND_STATEDIR "/rpcbind.xdr" #ifdef PORTMAP #define PMAPFILE RPCBIND_STATEDIR "/portmap.xdr" #endif +#ifndef O_DIRECTORY +#define O_DIRECTORY 0 +#endif +#ifndef O_NOFOLLOW +#define O_NOFOLLOW 0 +#endif + static bool_t write_struct(char *, xdrproc_t, void *); static bool_t read_struct(char *, xdrproc_t, void *); @@ -139,8 +143,21 @@ error: } void +mkdir_warmstart(int uid) +{ + if (mkdir(RPCBIND_STATEDIR, 0770) == 0) { + int fd = open(RPCBIND_STATEDIR, O_RDONLY | O_DIRECTORY | O_NOFOLLOW); + if (fd >= 0) { + fchown(fd, uid, -1); + close(fd); + } + } +} + +void write_warmstart() { + (void) mkdir(RPCBIND_STATEDIR, 0770); (void) write_struct(RPCBFILE, (xdrproc_t)xdr_rpcblist_ptr, &list_rbl); #ifdef PORTMAP (void) write_struct(PMAPFILE, (xdrproc_t)xdr_pmaplist_ptr, &list_pml);
rpcbind can save state in a file to allow restart without forgetting about running services. The default location is currently "/tmp" which is not ideal for system files. It is particularly unpleasant to put simple files there rather than creating a directory to contain them. On a modern Linux system it is preferable to use /run, and there it is even more consistent with practice to use a subdirectory. This directory needs to be create one each boot, and while there are tools (e.g. systemd-tmpfiles) which can do that it is cleaner to keep rpcbind self-contained and have it create the directory. So change the default location to /tmp/rpcbind, and create that directory. If a different user-id is used, we need to create and chown the directory before dropping privileges. We do this with care so avoid chowning the wrong thing by mistake. Signed-off-by: NeilBrown <neilb@suse.com> --- hi, I realized that I hadn't allowed for the fact that rpcbind changes it's uid, and we need to mkdir and chown before that. I've also reverted the move to /run, but moved to /tmp/rpcbind instead. A subdirectory is a good idea, even in /tmp. NeilBrown configure.ac | 4 ++-- src/rpcbind.c | 5 +++++ src/rpcbind.h | 1 + src/warmstart.c | 25 +++++++++++++++++++++---- 4 files changed, 29 insertions(+), 6 deletions(-)