diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2013-03-24 14:28:27 -0700 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2013-03-27 07:50:08 -0700 |
| commit | 87a8ebd637dafc255070f503909a053cf0d98d3f (patch) | |
| tree | 0bc879f9118c3333c73dfd15223a79e6219f64fd /include | |
| parent | a636b702ed1805e988ad3d8ff8b52c060f8b341c (diff) | |
| download | linux-stable-87a8ebd637dafc255070f503909a053cf0d98d3f.tar.gz linux-stable-87a8ebd637dafc255070f503909a053cf0d98d3f.tar.bz2 linux-stable-87a8ebd637dafc255070f503909a053cf0d98d3f.zip | |
userns: Restrict when proc and sysfs can be mounted
Only allow unprivileged mounts of proc and sysfs if they are already
mounted when the user namespace is created.
proc and sysfs are interesting because they have content that is
per namespace, and so fresh mounts are needed when new namespaces
are created while at the same time proc and sysfs have content that
is shared between every instance.
Respect the policy of who may see the shared content of proc and sysfs
by only allowing new mounts if there was an existing mount at the time
the user namespace was created.
In practice there are only two interesting cases: proc and sysfs are
mounted at their usual places, proc and sysfs are not mounted at all
(some form of mount namespace jail).
Cc: stable@vger.kernel.org
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/user_namespace.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h index 4ce009324933..b6b215f13b45 100644 --- a/include/linux/user_namespace.h +++ b/include/linux/user_namespace.h @@ -26,6 +26,8 @@ struct user_namespace { kuid_t owner; kgid_t group; unsigned int proc_inum; + bool may_mount_sysfs; + bool may_mount_proc; }; extern struct user_namespace init_user_ns; @@ -82,4 +84,6 @@ static inline void put_user_ns(struct user_namespace *ns) #endif +void update_mnt_policy(struct user_namespace *userns); + #endif /* _LINUX_USER_H */ |