From patchwork Mon Nov 14 07:05:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: NeilBrown X-Patchwork-Id: 9426653 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 79E3360471 for ; Mon, 14 Nov 2016 07:06:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6AF9A2890F for ; Mon, 14 Nov 2016 07:06:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5C6962891B; Mon, 14 Nov 2016 07:06:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_TVD_MIME_EPI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EE2D32890F for ; Mon, 14 Nov 2016 07:06:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751716AbcKNHGG (ORCPT ); Mon, 14 Nov 2016 02:06:06 -0500 Received: from mx2.suse.de ([195.135.220.15]:38348 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751201AbcKNHGG (ORCPT ); Mon, 14 Nov 2016 02:06:06 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 49F5CAC05; Mon, 14 Nov 2016 07:06:04 +0000 (UTC) From: NeilBrown To: Steve Dickson Date: Mon, 14 Nov 2016 18:05:57 +1100 Cc: Mike Frysinger , Linux NFS Mailing List , libtirpc-devel@lists.sourceforge.net Subject: [PATCH rpcbind v2] Move default state-dir to a subdirectory of /tmp In-Reply-To: <87polzj7sx.fsf@notabene.neil.brown.name> References: <877f8almcf.fsf@notabene.neil.brown.name> <20161111210034.GM21655@vapier.lan> <87polzj7sx.fsf@notabene.neil.brown.name> User-Agent: Notmuch/0.22.1 (http://notmuchmail.org) Emacs/24.5.1 (x86_64-suse-linux-gnu) Message-ID: <87vavqilre.fsf@notabene.neil.brown.name> MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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(-) 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 #include #include +#include #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);