summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2011-01-30 16:54:27 -0500
committerPaul Gortmaker <paul.gortmaker@windriver.com>2011-01-30 16:54:27 -0500
commitd168e78a297bca2e117ee0a51f865998feb5265a (patch)
tree019d609feeeaafa94a82acfa1975696226959ada
parentbf85b57a602cf3d75c5311c04b0999f279532228 (diff)
downloadrt-patches-d168e78a297bca2e117ee0a51f865998feb5265a.tar.gz
rm capabilities-Use-rcu-to-protect-task-lookup-in-sys_c.patchv2.6.33-4157-g832d30c
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--capabilities-Use-rcu-to-protect-task-lookup-in-sys_c.patch44
-rw-r--r--series1
2 files changed, 0 insertions, 45 deletions
diff --git a/capabilities-Use-rcu-to-protect-task-lookup-in-sys_c.patch b/capabilities-Use-rcu-to-protect-task-lookup-in-sys_c.patch
deleted file mode 100644
index e223b7a..0000000
--- a/capabilities-Use-rcu-to-protect-task-lookup-in-sys_c.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 59b446882dbd906785be95cfcc8d8caef1dba08c Mon Sep 17 00:00:00 2001
-From: Thomas Gleixner <tglx@linutronix.de>
-Date: Wed, 9 Dec 2009 16:48:13 +0100
-Subject: [PATCH] capabilities: Use rcu to protect task lookup in sys_capget
-
-commit 59b446882dbd906785be95cfcc8d8caef1dba08c in tip.
-
-cap_get_target_pid() protects the task lookup with tasklist_lock.
-security_capget() is called under tasklist_lock as well but
-tasklist_lock does not protect anything there. The capabilities are
-protected by RCU already.
-
-So tasklist_lock only protects the lookup and prevents the task going
-away, which can be done with rcu_read_lock() as well.
-
-Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-Cc: James Morris <jmorris@namei.org>
-Cc: linux-security-module@vger.kernel.org
-
-diff --git a/kernel/capability.c b/kernel/capability.c
-index 7f876e6..9e4697e 100644
---- a/kernel/capability.c
-+++ b/kernel/capability.c
-@@ -135,7 +135,7 @@ static inline int cap_get_target_pid(pid_t pid, kernel_cap_t *pEp,
- if (pid && (pid != task_pid_vnr(current))) {
- struct task_struct *target;
-
-- read_lock(&tasklist_lock);
-+ rcu_read_lock();
-
- target = find_task_by_vpid(pid);
- if (!target)
-@@ -143,7 +143,7 @@ static inline int cap_get_target_pid(pid_t pid, kernel_cap_t *pEp,
- else
- ret = security_capget(target, pEp, pIp, pPp);
-
-- read_unlock(&tasklist_lock);
-+ rcu_read_unlock();
- } else
- ret = security_capget(current, pEp, pIp, pPp);
-
---
-1.7.1.1
-
diff --git a/series b/series
index 67a7afd..3ffe3d5 100644
--- a/series
+++ b/series
@@ -341,7 +341,6 @@ trace-bundle-uprev-parts-from-merges.patch
#
audit-Do-not-send-uninitialized-data-for-AUDIT_TTY_G.patch
audit-Use-rcu-for-task-lookup-protection.patch
-capabilities-Use-rcu-to-protect-task-lookup-in-sys_c.patch
fs-Add-missing-rcu-protection-for-__task_cred-in-sys.patch
security-Fix-invalid-rcu-assumptions-in-comments.patch
oom-Add-missing-rcu-protection-of-__task_cred-in-dum.patch