diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2014-08-22 13:20:49 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2014-08-22 13:20:49 -0400 |
| commit | e1ff27a3caccb0a8fa8d013e8a4c8e1ce5710da6 (patch) | |
| tree | 3c1f3ae67b1c7e5930078e24cf671722f125bf2b /Revert-userns-Allow-unprivileged-users-to-create-use.patch | |
| parent | 03d9d91f7346f2eeff7b49fcf43f6b72f63c061b (diff) | |
| download | kernel-e1ff27a3caccb0a8fa8d013e8a4c8e1ce5710da6.tar.gz kernel-e1ff27a3caccb0a8fa8d013e8a4c8e1ce5710da6.tar.xz kernel-e1ff27a3caccb0a8fa8d013e8a4c8e1ce5710da6.zip | |
Drop userns revert patch (rhbz 917708)
Diffstat (limited to 'Revert-userns-Allow-unprivileged-users-to-create-use.patch')
| -rw-r--r-- | Revert-userns-Allow-unprivileged-users-to-create-use.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/Revert-userns-Allow-unprivileged-users-to-create-use.patch b/Revert-userns-Allow-unprivileged-users-to-create-use.patch deleted file mode 100644 index cea6bff01..000000000 --- a/Revert-userns-Allow-unprivileged-users-to-create-use.patch +++ /dev/null @@ -1,44 +0,0 @@ -Bugzilla: 917708 -Upstream-status: Fedora mustard - -From e3da68be55914bfeedb8866f191cc0958579611d Mon Sep 17 00:00:00 2001 -From: Josh Boyer <jwboyer@fedoraproject.org> -Date: Wed, 13 Nov 2013 10:21:18 -0500 -Subject: [PATCH] Revert "userns: Allow unprivileged users to create user - namespaces." - -This reverts commit 5eaf563e53294d6696e651466697eb9d491f3946. - -Conflicts: - kernel/fork.c ---- - kernel/fork.c | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/kernel/fork.c b/kernel/fork.c -index f6d11fc..e04c9a7 100644 ---- a/kernel/fork.c -+++ b/kernel/fork.c -@@ -1573,6 +1573,19 @@ long do_fork(unsigned long clone_flags, - long nr; - - /* -+ * Do some preliminary argument and permissions checking before we -+ * actually start allocating stuff -+ */ -+ if (clone_flags & CLONE_NEWUSER) { -+ /* hopefully this check will go away when userns support is -+ * complete -+ */ -+ if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SETUID) || -+ !capable(CAP_SETGID)) -+ return -EPERM; -+ } -+ -+ /* - * Determine whether and which event to report to ptracer. When - * called from kernel_thread or CLONE_UNTRACED is explicitly - * requested, no event is reported; otherwise, report if the event --- -1.8.3.1 - |