From: Trond Myklebust <trondmy@gmail.com>
To: Steve Dickson <SteveD@redhat.com>
Cc: "J. Bruce Fields" <bfields@redhat.com>, linux-nfs@vger.kernel.org
Subject: [PATCH v2 3/3] mountd: Canonicalise the rootdir in exportent_mkrealpath()
Date: Tue, 4 Jun 2019 13:57:34 -0400 [thread overview]
Message-ID: <20190604175734.98657-4-trond.myklebust@hammerspace.com> (raw)
In-Reply-To: <20190604175734.98657-3-trond.myklebust@hammerspace.com>
Ensure that we canonicalise the export path when generating the
real path.
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
---
support/export/export.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/support/export/export.c b/support/export/export.c
index 82bbb54c5e9e..c753f68e4d63 100644
--- a/support/export/export.c
+++ b/support/export/export.c
@@ -14,6 +14,7 @@
#include <sys/types.h>
#include <sys/param.h>
#include <netinet/in.h>
+#include <limits.h>
#include <stdlib.h>
#include <dirent.h>
#include <errno.h>
@@ -21,6 +22,7 @@
#include "nfslib.h"
#include "exportfs.h"
#include "nfsd_path.h"
+#include "xlog.h"
exp_hash_table exportlist[MCL_MAXTYPES] = {{NULL, {{NULL,NULL}, }}, };
static int export_hash(char *);
@@ -38,8 +40,14 @@ exportent_mkrealpath(struct exportent *eep)
const char *chroot = nfsd_path_nfsd_rootdir();
char *ret = NULL;
- if (chroot)
- ret = nfsd_path_prepend_dir(chroot, eep->e_path);
+ if (chroot) {
+ char buffer[PATH_MAX];
+ if (realpath(chroot, buffer))
+ ret = nfsd_path_prepend_dir(buffer, eep->e_path);
+ else
+ xlog(D_GENERAL, "%s: failed to resolve path %s: %m",
+ __func__, chroot);
+ }
if (!ret)
ret = xstrdup(eep->e_path);
eep->e_realpath = ret;
--
2.21.0
prev parent reply other threads:[~2019-06-04 17:59 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-04 17:57 [PATCH v2 0/3] Incremental against [exports] rootdir patchset Trond Myklebust
2019-06-04 17:57 ` [PATCH v2 1/3] mountd: Fix up incorrect comparison in next_mnt() Trond Myklebust
2019-06-04 17:57 ` [PATCH v2 2/3] mountd: Ensure nfsd_path_strip_root() uses the canonicalised path Trond Myklebust
2019-06-04 17:57 ` Trond Myklebust [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190604175734.98657-4-trond.myklebust@hammerspace.com \
--to=trondmy@gmail.com \
--cc=SteveD@redhat.com \
--cc=bfields@redhat.com \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).