Pull namespace changes from Eric Biederman: "This is an assorted mishmash of small cleanups, enhancements and bug fixes. The major theme is user namespace mount restrictions. nsown_capable is killed as it encourages not thinking about details that need to be considered. A very hard to hit pid namespace exiting bug was finally tracked and fixed. A couple of cleanups to the basic namespace infrastructure. Finally there is an enhancement that makes per user namespace capabilities usable as capabilities, and an enhancement that allows the per userns root to nice other processes in the user namespace" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: userns: Kill nsown_capable it makes the wrong thing easy capabilities: allow nice if we are privileged pidns: Don't have unshare(CLONE_NEWPID) imply CLONE_THREAD userns: Allow PR_CAPBSET_DROP in a user namespace. namespaces: Simplify copy_namespaces so it is clear what is going on. pidns: Fix hang in zap_pid_ns_processes by sending a potentially extra wakeup sysfs: Restrict mounting sysfs userns: Better restrictions on when proc and sysfs can be mounted vfs: Don't copy mount bind mounts of /proc/<pid>/ns/mnt between namespaces kernel/nsproxy.c: Improving a snippet of code. proc: Restrict mounting the proc filesystem vfs: Lock in place mounts from more privileged users
Showing the changes to kernel/fork.c (1 of 27 files). Show all
Unified · Split
| @@ -1824,11 +1824,6 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags) · 1823 unmodified lines | ||
| 1824 | 1824 | */ |
| 1825 | 1825 | if (unshare_flags & CLONE_NEWUSER) |
| 1826 | 1826 | unshare_flags |= CLONE_THREAD | CLONE_FS; |
| 1827 | − /* | |
| 1828 | − * If unsharing a pid namespace must also unshare the thread. | |
| 1829 | − */ | |
| 1830 | − if (unshare_flags & CLONE_NEWPID) | |
| 1831 | − unshare_flags |= CLONE_THREAD; | |
| 1832 | 1827 | /* |
| 1833 | 1828 | * If unsharing a thread from a thread group, must also unshare vm. |
| 1834 | 1829 | */ |