Page MenuHomeFreeBSD
Files F168972556

D38144.id115427.diff
No OneTemporary
Actions

D38144.id115427.diff
View Options

diff --git a/sys/kern/vfs_export.c.vnet b/sys/kern/vfs_export.c
--- a/sys/kern/vfs_export.c.vnet
+++ b/sys/kern/vfs_export.c
@@ -52,6 +52,7 @@
#include <sys/mbuf.h>
#include <sys/mount.h>
#include <sys/mutex.h>
+#include <sys/proc.h>
#include <sys/rmlock.h>
#include <sys/refcount.h>
#include <sys/signalvar.h>
@@ -301,6 +302,7 @@
{
struct netexport *nep;
int error;
+ bool injail;
if ((argp->ex_flags & (MNT_DELEXPORT | MNT_EXPORTED)) == 0)
return (EINVAL);
@@ -311,6 +313,7 @@
return (EINVAL);
error = 0;
+ injail = jailed(curthread->td_ucred);
lockmgr(&mp->mnt_explock, LK_EXCLUSIVE, NULL);
nep = mp->mnt_export;
if (argp->ex_flags & MNT_DELEXPORT) {
@@ -318,6 +321,15 @@
error = ENOENT;
goto out;
}
+ if (injail && (mp->mnt_flag & MNT_EXJAIL) == 0) {
+ /* EPERM will get logged by mountd(8). */
+ error = EPERM;
+ goto out;
+ } else if (!injail && (mp->mnt_flag & MNT_EXJAIL) != 0) {
+ /* EXDEV will not get logged by mountd(8). */
+ error = EXDEV;
+ goto out;
+ }
if (mp->mnt_flag & MNT_EXPUBLIC) {
vfs_setpublicfs(NULL, NULL, NULL);
MNT_ILOCK(mp);
@@ -329,13 +341,17 @@
free(nep, M_MOUNT);
nep = NULL;
MNT_ILOCK(mp);
- mp->mnt_flag &= ~(MNT_EXPORTED | MNT_DEFEXPORTED);
+ mp->mnt_flag &= ~(MNT_EXPORTED | MNT_DEFEXPORTED | MNT_EXJAIL);
MNT_IUNLOCK(mp);
}
if (argp->ex_flags & MNT_EXPORTED) {
if (nep == NULL) {
nep = malloc(sizeof(struct netexport), M_MOUNT, M_WAITOK | M_ZERO);
mp->mnt_export = nep;
+ } else if ((injail && (mp->mnt_flag & MNT_EXJAIL) == 0) ||
+ (!injail && (mp->mnt_flag & MNT_EXJAIL) != 0)) {
+ error = EPERM;
+ goto out;
}
if (argp->ex_flags & MNT_EXPUBLIC) {
if ((error = vfs_setpublicfs(mp, nep, argp)) != 0)
@@ -352,6 +368,8 @@
goto out;
MNT_ILOCK(mp);
mp->mnt_flag |= MNT_EXPORTED;
+ if (injail)
+ mp->mnt_flag |= MNT_EXJAIL;
MNT_IUNLOCK(mp);
}
diff --git a/sys/sys/mount.h.vnet b/sys/sys/mount.h
--- a/sys/sys/mount.h.vnet
+++ b/sys/sys/mount.h
@@ -399,6 +399,7 @@
#define MNT_EXTLS 0x0000004000000000ULL /* require TLS */
#define MNT_EXTLSCERT 0x0000008000000000ULL /* require TLS with client cert */
#define MNT_EXTLSCERTUSER 0x0000010000000000ULL /* require TLS with user cert */
+#define MNT_EXJAIL 0x0000020000000000ULL /* exported in a jail */
/*
* Flags set by internal operations, but visible to the user.

File Metadata

Mime Type
text/plain
Expires
Tue, Sep 1, 12:42 AM (7 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37736205
Default Alt Text
D38144.id115427.diff (2 KB)

Event Timeline