svn commit: r295951 - in stable/10: sys/compat/linprocfs sys/compat/linsysfs sys/kern sys/sys usr.sbin/jail
Marcelo Araujo
araujo at FreeBSD.org
Wed Feb 24 02:34:14 UTC 2016
Author: araujo
Date: Wed Feb 24 02:34:11 2016
New Revision: 295951
URL: https://svnweb.freebsd.org/changeset/base/295951
Log:
MFH: 285685
Add support to the jail framework to be able to mount linsysfs(5) and linprocfs(5).
PR: 207179
Requested by: thomas at gibfest.dk
Reviewed by: jamie, bapt
Approved by: re (gjb)
Sponsored by: gandi.net
Differential Revision: https://reviews.freebsd.org/D5390
Modified:
stable/10/sys/compat/linprocfs/linprocfs.c
stable/10/sys/compat/linsysfs/linsysfs.c
stable/10/sys/kern/kern_jail.c
stable/10/sys/sys/jail.h
stable/10/usr.sbin/jail/jail.8
Modified: stable/10/sys/compat/linprocfs/linprocfs.c
==============================================================================
--- stable/10/sys/compat/linprocfs/linprocfs.c Wed Feb 24 01:58:40 2016 (r295950)
+++ stable/10/sys/compat/linprocfs/linprocfs.c Wed Feb 24 02:34:11 2016 (r295951)
@@ -1514,7 +1514,7 @@ linprocfs_uninit(PFS_INIT_ARGS)
return (0);
}
-PSEUDOFS(linprocfs, 1, 0);
+PSEUDOFS(linprocfs, 1, PR_ALLOW_MOUNT_LINPROCFS);
#if defined(__amd64__)
MODULE_DEPEND(linprocfs, linux_common, 1, 1, 1);
#else
Modified: stable/10/sys/compat/linsysfs/linsysfs.c
==============================================================================
--- stable/10/sys/compat/linsysfs/linsysfs.c Wed Feb 24 01:58:40 2016 (r295950)
+++ stable/10/sys/compat/linsysfs/linsysfs.c Wed Feb 24 02:34:11 2016 (r295951)
@@ -274,7 +274,7 @@ linsysfs_uninit(PFS_INIT_ARGS)
return (0);
}
-PSEUDOFS(linsysfs, 1, 0);
+PSEUDOFS(linsysfs, 1, PR_ALLOW_MOUNT_LINSYSFS);
#if defined(__amd64__)
MODULE_DEPEND(linsysfs, linux_common, 1, 1, 1);
#else
Modified: stable/10/sys/kern/kern_jail.c
==============================================================================
--- stable/10/sys/kern/kern_jail.c Wed Feb 24 01:58:40 2016 (r295950)
+++ stable/10/sys/kern/kern_jail.c Wed Feb 24 02:34:11 2016 (r295951)
@@ -208,6 +208,8 @@ static char *pr_allow_names[] = {
"allow.mount.procfs",
"allow.mount.tmpfs",
"allow.mount.fdescfs",
+ "allow.mount.linprocfs",
+ "allow.mount.linsysfs",
};
const size_t pr_allow_names_size = sizeof(pr_allow_names);
@@ -225,6 +227,8 @@ static char *pr_allow_nonames[] = {
"allow.mount.noprocfs",
"allow.mount.notmpfs",
"allow.mount.nofdescfs",
+ "allow.mount.nolinprocfs",
+ "allow.mount.nolinsysfs",
};
const size_t pr_allow_nonames_size = sizeof(pr_allow_nonames);
@@ -4315,6 +4319,14 @@ SYSCTL_PROC(_security_jail, OID_AUTO, mo
CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE,
NULL, PR_ALLOW_MOUNT_PROCFS, sysctl_jail_default_allow, "I",
"Processes in jail can mount the procfs file system");
+SYSCTL_PROC(_security_jail, OID_AUTO, mount_linprocfs_allowed,
+ CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE,
+ NULL, PR_ALLOW_MOUNT_LINPROCFS, sysctl_jail_default_allow, "I",
+ "Processes in jail can mount the linprocfs file system");
+SYSCTL_PROC(_security_jail, OID_AUTO, mount_linsysfs_allowed,
+ CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE,
+ NULL, PR_ALLOW_MOUNT_LINSYSFS, sysctl_jail_default_allow, "I",
+ "Processes in jail can mount the linsysfs file system");
SYSCTL_PROC(_security_jail, OID_AUTO, mount_tmpfs_allowed,
CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE,
NULL, PR_ALLOW_MOUNT_TMPFS, sysctl_jail_default_allow, "I",
@@ -4481,6 +4493,10 @@ SYSCTL_JAIL_PARAM(_allow_mount, nullfs,
"B", "Jail may mount the nullfs file system");
SYSCTL_JAIL_PARAM(_allow_mount, procfs, CTLTYPE_INT | CTLFLAG_RW,
"B", "Jail may mount the procfs file system");
+SYSCTL_JAIL_PARAM(_allow_mount, linprocfs, CTLTYPE_INT | CTLFLAG_RW,
+ "B", "Jail may mount the linprocfs file system");
+SYSCTL_JAIL_PARAM(_allow_mount, linsysfs, CTLTYPE_INT | CTLFLAG_RW,
+ "B", "Jail may mount the linsysfs file system");
SYSCTL_JAIL_PARAM(_allow_mount, tmpfs, CTLTYPE_INT | CTLFLAG_RW,
"B", "Jail may mount the tmpfs file system");
SYSCTL_JAIL_PARAM(_allow_mount, zfs, CTLTYPE_INT | CTLFLAG_RW,
Modified: stable/10/sys/sys/jail.h
==============================================================================
--- stable/10/sys/sys/jail.h Wed Feb 24 01:58:40 2016 (r295950)
+++ stable/10/sys/sys/jail.h Wed Feb 24 02:34:11 2016 (r295951)
@@ -232,7 +232,9 @@ struct prison_racct {
#define PR_ALLOW_MOUNT_PROCFS 0x0400
#define PR_ALLOW_MOUNT_TMPFS 0x0800
#define PR_ALLOW_MOUNT_FDESCFS 0x1000
-#define PR_ALLOW_ALL 0x1fff
+#define PR_ALLOW_MOUNT_LINPROCFS 0x2000
+#define PR_ALLOW_MOUNT_LINSYSFS 0x4000
+#define PR_ALLOW_ALL 0x7fff
/*
* OSD methods
Modified: stable/10/usr.sbin/jail/jail.8
==============================================================================
--- stable/10/usr.sbin/jail/jail.8 Wed Feb 24 01:58:40 2016 (r295950)
+++ stable/10/usr.sbin/jail/jail.8 Wed Feb 24 02:34:11 2016 (r295951)
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd February 25, 2015
+.Dd July 6, 2015
.Dt JAIL 8
.Os
.Sh NAME
@@ -563,6 +563,22 @@ This permission is effective only togeth
and only when
.Va enforce_statfs
is set to a value lower than 2.
+.It Va allow.mount.linprocfs
+privileged users inside the jail will be able to mount and unmount the
+linprocfs file system.
+This permission is effective only together with
+.Va allow.mount
+and only when
+.Va enforce_statfs
+is set to a value lower than 2.
+.It Va allow.mount.linsysfs
+privileged users inside the jail will be able to mount and unmount the
+linsysfs file system.
+This permission is effective only together with
+.Va allow.mount
+and only when
+.Va enforce_statfs
+is set to a value lower than 2.
.It Va allow.mount.tmpfs
privileged users inside the jail will be able to mount and unmount the
tmpfs file system.
@@ -1210,6 +1226,8 @@ environment of the first jail.
.Xr fdescfs 5 ,
.Xr jail.conf 5 ,
.Xr procfs 5 ,
+.Xr linprocfs 5 ,
+.Xr linsysfs 5 ,
.Xr rc.conf 5 ,
.Xr sysctl.conf 5 ,
.Xr chroot 8 ,
More information about the svn-src-stable
mailing list