drop fs-proc-base.c-use-ns_capable-instead-of-capable-for.patch

diff --git a/queue-4.14/fs-proc-base.c-use-ns_capable-instead-of-capable-for.patch b/queue-4.14/fs-proc-base.c-use-ns_capable-instead-of-capable-for.patch
deleted file mode 100644 (file)
index 459aacc..0000000
--- a/queue-4.14/fs-proc-base.c-use-ns_capable-instead-of-capable-for.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 4a43f992c7ec4eaadf1b36b1614c5e1c3f3841e1 Mon Sep 17 00:00:00 2001
-From: Benjamin Gordon <bmgordon@google.com>
-Date: Thu, 3 Jan 2019 15:25:56 -0800
-Subject: fs/proc/base.c: use ns_capable instead of capable for timerslack_ns
-
-[ Upstream commit 8da0b4f692c6d90b09c91f271517db746a22ff67 ]
-
-Access to timerslack_ns is controlled by a process having CAP_SYS_NICE
-in its effective capability set, but the current check looks in the root
-namespace instead of the process' user namespace.  Since a process is
-allowed to do other activities controlled by CAP_SYS_NICE inside a
-namespace, it should also be able to adjust timerslack_ns.
-
-Link: http://lkml.kernel.org/r/20181030180012.232896-1-bmgordon@google.com
-Signed-off-by: Benjamin Gordon <bmgordon@google.com>
-Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>
-Cc: John Stultz <john.stultz@linaro.org>
-Cc: "Eric W. Biederman" <ebiederm@xmission.com>
-Cc: Kees Cook <keescook@chromium.org>
-Cc: "Serge E. Hallyn" <serge@hallyn.com>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: Arjan van de Ven <arjan@linux.intel.com>
-Cc: Oren Laadan <orenl@cellrox.com>
-Cc: Ruchi Kandoi <kandoiruchi@google.com>
-Cc: Rom Lemarchand <romlem@android.com>
-Cc: Todd Kjos <tkjos@google.com>
-Cc: Colin Cross <ccross@android.com>
-Cc: Nick Kralevich <nnk@google.com>
-Cc: Dmitry Shmidt <dimitrysh@google.com>
-Cc: Elliott Hughes <enh@google.com>
-Cc: Alexey Dobriyan <adobriyan@gmail.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/proc/base.c | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/fs/proc/base.c b/fs/proc/base.c
-index 9063738ff1f0..e26155a97afa 100644
---- a/fs/proc/base.c
-+++ b/fs/proc/base.c
-@@ -2374,10 +2374,13 @@ static ssize_t timerslack_ns_write(struct file *file, const char __user *buf,
-               return -ESRCH;
- 
-       if (p != current) {
--              if (!capable(CAP_SYS_NICE)) {
-+              rcu_read_lock();
-+              if (!ns_capable(__task_cred(p)->user_ns, CAP_SYS_NICE)) {
-+                      rcu_read_unlock();
-                       count = -EPERM;
-                       goto out;
-               }
-+              rcu_read_unlock();
- 
-               err = security_task_setscheduler(p);
-               if (err) {
-@@ -2410,11 +2413,14 @@ static int timerslack_ns_show(struct seq_file *m, void *v)
-               return -ESRCH;
- 
-       if (p != current) {
--
--              if (!capable(CAP_SYS_NICE)) {
-+              rcu_read_lock();
-+              if (!ns_capable(__task_cred(p)->user_ns, CAP_SYS_NICE)) {
-+                      rcu_read_unlock();
-                       err = -EPERM;
-                       goto out;
-               }
-+              rcu_read_unlock();
-+
-               err = security_task_getscheduler(p);
-               if (err)
-                       goto out;
--- 
-2.19.1
-

diff --git a/queue-4.14/series b/queue-4.14/series
index 9c554806d6729651c1dd8391e482a04c8d634c8f..a7ba92a692fb525096615d176242fe8c6be14581 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -153,7 +153,6 @@ thermal-bcm2835-enable-hwmon-explicitly.patch
 kdb-don-t-back-trace-on-a-cpu-that-didn-t-round-up.patch
 thermal-generic-adc-fix-adc-to-temp-interpolation.patch
 hid-lenovo-add-checks-to-fix-of_led_classdev_registe.patch
-fs-proc-base.c-use-ns_capable-instead-of-capable-for.patch
 kernel-hung_task.c-break-rcu-locks-based-on-jiffies.patch
 proc-sysctl-fix-return-error-for-proc_doulongvec_min.patch
 kernel-hung_task.c-force-console-verbose-before-pani.patch

diff --git a/queue-4.19/fs-proc-base.c-use-ns_capable-instead-of-capable-for.patch b/queue-4.19/fs-proc-base.c-use-ns_capable-instead-of-capable-for.patch
deleted file mode 100644 (file)
index 3d61d17..0000000
--- a/queue-4.19/fs-proc-base.c-use-ns_capable-instead-of-capable-for.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 2c958c7aae5c4f565afc38d4851650552d933235 Mon Sep 17 00:00:00 2001
-From: Benjamin Gordon <bmgordon@google.com>
-Date: Thu, 3 Jan 2019 15:25:56 -0800
-Subject: fs/proc/base.c: use ns_capable instead of capable for timerslack_ns
-
-[ Upstream commit 8da0b4f692c6d90b09c91f271517db746a22ff67 ]
-
-Access to timerslack_ns is controlled by a process having CAP_SYS_NICE
-in its effective capability set, but the current check looks in the root
-namespace instead of the process' user namespace.  Since a process is
-allowed to do other activities controlled by CAP_SYS_NICE inside a
-namespace, it should also be able to adjust timerslack_ns.
-
-Link: http://lkml.kernel.org/r/20181030180012.232896-1-bmgordon@google.com
-Signed-off-by: Benjamin Gordon <bmgordon@google.com>
-Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>
-Cc: John Stultz <john.stultz@linaro.org>
-Cc: "Eric W. Biederman" <ebiederm@xmission.com>
-Cc: Kees Cook <keescook@chromium.org>
-Cc: "Serge E. Hallyn" <serge@hallyn.com>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: Arjan van de Ven <arjan@linux.intel.com>
-Cc: Oren Laadan <orenl@cellrox.com>
-Cc: Ruchi Kandoi <kandoiruchi@google.com>
-Cc: Rom Lemarchand <romlem@android.com>
-Cc: Todd Kjos <tkjos@google.com>
-Cc: Colin Cross <ccross@android.com>
-Cc: Nick Kralevich <nnk@google.com>
-Cc: Dmitry Shmidt <dimitrysh@google.com>
-Cc: Elliott Hughes <enh@google.com>
-Cc: Alexey Dobriyan <adobriyan@gmail.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/proc/base.c | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/fs/proc/base.c b/fs/proc/base.c
-index 7e9f07bf260d..5bdcf2159ff0 100644
---- a/fs/proc/base.c
-+++ b/fs/proc/base.c
-@@ -2356,10 +2356,13 @@ static ssize_t timerslack_ns_write(struct file *file, const char __user *buf,
-               return -ESRCH;
- 
-       if (p != current) {
--              if (!capable(CAP_SYS_NICE)) {
-+              rcu_read_lock();
-+              if (!ns_capable(__task_cred(p)->user_ns, CAP_SYS_NICE)) {
-+                      rcu_read_unlock();
-                       count = -EPERM;
-                       goto out;
-               }
-+              rcu_read_unlock();
- 
-               err = security_task_setscheduler(p);
-               if (err) {
-@@ -2392,11 +2395,14 @@ static int timerslack_ns_show(struct seq_file *m, void *v)
-               return -ESRCH;
- 
-       if (p != current) {
--
--              if (!capable(CAP_SYS_NICE)) {
-+              rcu_read_lock();
-+              if (!ns_capable(__task_cred(p)->user_ns, CAP_SYS_NICE)) {
-+                      rcu_read_unlock();
-                       err = -EPERM;
-                       goto out;
-               }
-+              rcu_read_unlock();
-+
-               err = security_task_getscheduler(p);
-               if (err)
-                       goto out;
--- 
-2.19.1
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 9daf7a57a8232b09dff66e7595cadc04beea001e..dc6e593a883a6516834704ce415613b08d4cf409 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -233,7 +233,6 @@ pci-imx-enable-msi-from-downstream-components.patch
 thermal-generic-adc-fix-adc-to-temp-interpolation.patch
 hid-lenovo-add-checks-to-fix-of_led_classdev_registe.patch
 arm64-sve-ptrace-fix-sve_pt_regs_offset-definition.patch
-fs-proc-base.c-use-ns_capable-instead-of-capable-for.patch
 kernel-hung_task.c-break-rcu-locks-based-on-jiffies.patch
 proc-sysctl-fix-return-error-for-proc_doulongvec_min.patch
 kernel-hung_task.c-force-console-verbose-before-pani.patch

diff --git a/queue-4.20/fs-proc-base.c-use-ns_capable-instead-of-capable-for.patch b/queue-4.20/fs-proc-base.c-use-ns_capable-instead-of-capable-for.patch
deleted file mode 100644 (file)
index 36a8e0b..0000000
--- a/queue-4.20/fs-proc-base.c-use-ns_capable-instead-of-capable-for.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 3152c5232570b2d8b57bf8edfbe594c76c46e139 Mon Sep 17 00:00:00 2001
-From: Benjamin Gordon <bmgordon@google.com>
-Date: Thu, 3 Jan 2019 15:25:56 -0800
-Subject: fs/proc/base.c: use ns_capable instead of capable for timerslack_ns
-
-[ Upstream commit 8da0b4f692c6d90b09c91f271517db746a22ff67 ]
-
-Access to timerslack_ns is controlled by a process having CAP_SYS_NICE
-in its effective capability set, but the current check looks in the root
-namespace instead of the process' user namespace.  Since a process is
-allowed to do other activities controlled by CAP_SYS_NICE inside a
-namespace, it should also be able to adjust timerslack_ns.
-
-Link: http://lkml.kernel.org/r/20181030180012.232896-1-bmgordon@google.com
-Signed-off-by: Benjamin Gordon <bmgordon@google.com>
-Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>
-Cc: John Stultz <john.stultz@linaro.org>
-Cc: "Eric W. Biederman" <ebiederm@xmission.com>
-Cc: Kees Cook <keescook@chromium.org>
-Cc: "Serge E. Hallyn" <serge@hallyn.com>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: Arjan van de Ven <arjan@linux.intel.com>
-Cc: Oren Laadan <orenl@cellrox.com>
-Cc: Ruchi Kandoi <kandoiruchi@google.com>
-Cc: Rom Lemarchand <romlem@android.com>
-Cc: Todd Kjos <tkjos@google.com>
-Cc: Colin Cross <ccross@android.com>
-Cc: Nick Kralevich <nnk@google.com>
-Cc: Dmitry Shmidt <dimitrysh@google.com>
-Cc: Elliott Hughes <enh@google.com>
-Cc: Alexey Dobriyan <adobriyan@gmail.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/proc/base.c | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/fs/proc/base.c b/fs/proc/base.c
-index ce3465479447..98525af0953e 100644
---- a/fs/proc/base.c
-+++ b/fs/proc/base.c
-@@ -2356,10 +2356,13 @@ static ssize_t timerslack_ns_write(struct file *file, const char __user *buf,
-               return -ESRCH;
- 
-       if (p != current) {
--              if (!capable(CAP_SYS_NICE)) {
-+              rcu_read_lock();
-+              if (!ns_capable(__task_cred(p)->user_ns, CAP_SYS_NICE)) {
-+                      rcu_read_unlock();
-                       count = -EPERM;
-                       goto out;
-               }
-+              rcu_read_unlock();
- 
-               err = security_task_setscheduler(p);
-               if (err) {
-@@ -2392,11 +2395,14 @@ static int timerslack_ns_show(struct seq_file *m, void *v)
-               return -ESRCH;
- 
-       if (p != current) {
--
--              if (!capable(CAP_SYS_NICE)) {
-+              rcu_read_lock();
-+              if (!ns_capable(__task_cred(p)->user_ns, CAP_SYS_NICE)) {
-+                      rcu_read_unlock();
-                       err = -EPERM;
-                       goto out;
-               }
-+              rcu_read_unlock();
-+
-               err = security_task_getscheduler(p);
-               if (err)
-                       goto out;
--- 
-2.19.1
-

diff --git a/queue-4.20/series b/queue-4.20/series
index ea2d9d1141290052c2d445dd53e1eeac6f9c8e5a..751b1a7cac0e6a9b8dcfc675cda30451fb2d1a16 100644 (file)
--- a/queue-4.20/series
+++ b/queue-4.20/series
@@ -274,7 +274,6 @@ block-swim3-fix-regression-on-powerbook-g3.patch
 thermal-generic-adc-fix-adc-to-temp-interpolation.patch
 hid-lenovo-add-checks-to-fix-of_led_classdev_registe.patch
 arm64-sve-ptrace-fix-sve_pt_regs_offset-definition.patch
-fs-proc-base.c-use-ns_capable-instead-of-capable-for.patch
 kernel-hung_task.c-break-rcu-locks-based-on-jiffies.patch
 proc-sysctl-fix-return-error-for-proc_doulongvec_min.patch
 kernel-hung_task.c-force-console-verbose-before-pani.patch

diff --git a/queue-4.9/fs-proc-base.c-use-ns_capable-instead-of-capable-for.patch b/queue-4.9/fs-proc-base.c-use-ns_capable-instead-of-capable-for.patch
deleted file mode 100644 (file)
index 0499a96..0000000
--- a/queue-4.9/fs-proc-base.c-use-ns_capable-instead-of-capable-for.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 161c6ea33a40f3775d2af91f3ae20c89048a3c19 Mon Sep 17 00:00:00 2001
-From: Benjamin Gordon <bmgordon@google.com>
-Date: Thu, 3 Jan 2019 15:25:56 -0800
-Subject: fs/proc/base.c: use ns_capable instead of capable for timerslack_ns
-
-[ Upstream commit 8da0b4f692c6d90b09c91f271517db746a22ff67 ]
-
-Access to timerslack_ns is controlled by a process having CAP_SYS_NICE
-in its effective capability set, but the current check looks in the root
-namespace instead of the process' user namespace.  Since a process is
-allowed to do other activities controlled by CAP_SYS_NICE inside a
-namespace, it should also be able to adjust timerslack_ns.
-
-Link: http://lkml.kernel.org/r/20181030180012.232896-1-bmgordon@google.com
-Signed-off-by: Benjamin Gordon <bmgordon@google.com>
-Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>
-Cc: John Stultz <john.stultz@linaro.org>
-Cc: "Eric W. Biederman" <ebiederm@xmission.com>
-Cc: Kees Cook <keescook@chromium.org>
-Cc: "Serge E. Hallyn" <serge@hallyn.com>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: Arjan van de Ven <arjan@linux.intel.com>
-Cc: Oren Laadan <orenl@cellrox.com>
-Cc: Ruchi Kandoi <kandoiruchi@google.com>
-Cc: Rom Lemarchand <romlem@android.com>
-Cc: Todd Kjos <tkjos@google.com>
-Cc: Colin Cross <ccross@android.com>
-Cc: Nick Kralevich <nnk@google.com>
-Cc: Dmitry Shmidt <dimitrysh@google.com>
-Cc: Elliott Hughes <enh@google.com>
-Cc: Alexey Dobriyan <adobriyan@gmail.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/proc/base.c | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/fs/proc/base.c b/fs/proc/base.c
-index 79702d405ba7..f73de326c630 100644
---- a/fs/proc/base.c
-+++ b/fs/proc/base.c
-@@ -2337,10 +2337,13 @@ static ssize_t timerslack_ns_write(struct file *file, const char __user *buf,
-               return -ESRCH;
- 
-       if (p != current) {
--              if (!capable(CAP_SYS_NICE)) {
-+              rcu_read_lock();
-+              if (!ns_capable(__task_cred(p)->user_ns, CAP_SYS_NICE)) {
-+                      rcu_read_unlock();
-                       count = -EPERM;
-                       goto out;
-               }
-+              rcu_read_unlock();
- 
-               err = security_task_setscheduler(p);
-               if (err) {
-@@ -2373,11 +2376,14 @@ static int timerslack_ns_show(struct seq_file *m, void *v)
-               return -ESRCH;
- 
-       if (p != current) {
--
--              if (!capable(CAP_SYS_NICE)) {
-+              rcu_read_lock();
-+              if (!ns_capable(__task_cred(p)->user_ns, CAP_SYS_NICE)) {
-+                      rcu_read_unlock();
-                       err = -EPERM;
-                       goto out;
-               }
-+              rcu_read_unlock();
-+
-               err = security_task_getscheduler(p);
-               if (err)
-                       goto out;
--- 
-2.19.1
-

diff --git a/queue-4.9/series b/queue-4.9/series
index 9c50e6fe77471b7a5bc0db79e147fe65c9775c48..72601b5ba00824a10beedbbad0a2947ae3432e9d 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -94,7 +94,6 @@ fsl-fman-use-gfp_atomic-in-memac-tgec-_add_hash_mac_.patch
 block-swim3-fix-ebusy-error-when-re-opening-device-a.patch
 thermal-generic-adc-fix-adc-to-temp-interpolation.patch
 hid-lenovo-add-checks-to-fix-of_led_classdev_registe.patch
-fs-proc-base.c-use-ns_capable-instead-of-capable-for.patch
 kernel-hung_task.c-break-rcu-locks-based-on-jiffies.patch
 proc-sysctl-fix-return-error-for-proc_doulongvec_min.patch
 fs-epoll-drop-ovflist-branch-prediction.patch