[gentoo-commits] linux-patches r2081 - genpatches-2.6/trunk/3.0

[Mike Pagano (mpagano)]

Author: mpagano
Date: 2012-02-07 13:43:37 +0000 (Tue, 07 Feb 2012)
New Revision: 2081

Removed:
   genpatches-2.6/trunk/3.0/2100_proc-mem-handling-fix.patch
Modified:
   genpatches-2.6/trunk/3.0/0000_README
Log:
Linux patches 3.0.18, 3.0.19 and 3.0.20. Removal of redundant patch

Modified: genpatches-2.6/trunk/3.0/0000_README
===================================================================
--- genpatches-2.6/trunk/3.0/0000_README	2012-02-07 13:19:19 UTC (rev 2080)
+++ genpatches-2.6/trunk/3.0/0000_README	2012-02-07 13:43:37 UTC (rev 2081)
@@ -107,14 +107,22 @@
 From:   http://www.kernel.org
 Desc:   Linux 3.0.17
 
+Patch:  1017_linux-3.0.18.patch
+From:   http://www.kernel.org
+Desc:   Linux 3.0.18
+
+Patch:  1018_linux-3.0.19.patch
+From:   http://www.kernel.org
+Desc:   Linux 3.0.19
+
+Patch:  1019_linux-3.0.20.patch
+From:   http://www.kernel.org
+Desc:   Linux 3.0.20
+
 Patch:  1800_fix-zcache-build.patch
 From:   http://bugs.gentoo.org/show_bug.cgi?id=376325
 Desc:   Fix zcache build error
 
-Patch:  2100_proc-mem-handling-fix.patch
-From:   http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
-Desc:   Clean up and fix /proc/<pid>/mem handling, prevent local privilege escalation
-
 Patch:  2600_Input-ALPS-Move-protocol-information-to-Documentation.patch
 From:   http://bugs.gentoo.org/show_bug.cgi?id=318567
 Desc:   ALPS Touchpad - Move protocol information to Documentation

Deleted: genpatches-2.6/trunk/3.0/2100_proc-mem-handling-fix.patch
===================================================================
--- genpatches-2.6/trunk/3.0/2100_proc-mem-handling-fix.patch	2012-02-07 13:19:19 UTC (rev 2080)
+++ genpatches-2.6/trunk/3.0/2100_proc-mem-handling-fix.patch	2012-02-07 13:43:37 UTC (rev 2081)
@@ -1,226 +0,0 @@
---- a/fs/proc/base.c	2012-01-24 09:59:44.851331187 -0500
-+++ b/fs/proc/base.c	2012-01-24 10:05:15.530851282 -0500
-@@ -194,65 +194,7 @@ static int proc_root_link(struct inode *
- 	return result;
- }
- 
--static struct mm_struct *__check_mem_permission(struct task_struct *task)
--{
--	struct mm_struct *mm;
--
--	mm = get_task_mm(task);
--	if (!mm)
--		return ERR_PTR(-EINVAL);
--
--	/*
--	 * A task can always look at itself, in case it chooses
--	 * to use system calls instead of load instructions.
--	 */
--	if (task == current)
--		return mm;
--
--	/*
--	 * If current is actively ptrace'ing, and would also be
--	 * permitted to freshly attach with ptrace now, permit it.
--	 */
--	if (task_is_stopped_or_traced(task)) {
--		int match;
--		rcu_read_lock();
--		match = (tracehook_tracer_task(task) == current);
--		rcu_read_unlock();
--		if (match && ptrace_may_access(task, PTRACE_MODE_ATTACH))
--			return mm;
--	}
--
--	/*
--	 * No one else is allowed.
--	 */
--	mmput(mm);
--	return ERR_PTR(-EPERM);
--}
--
--/*
-- * If current may access user memory in @task return a reference to the
-- * corresponding mm, otherwise ERR_PTR.
-- */
--static struct mm_struct *check_mem_permission(struct task_struct *task)
--{
--	struct mm_struct *mm;
--	int err;
--
--	/*
--	 * Avoid racing if task exec's as we might get a new mm but validate
--	 * against old credentials.
--	 */
--	err = mutex_lock_killable(&task->signal->cred_guard_mutex);
--	if (err)
--		return ERR_PTR(err);
--
--	mm = __check_mem_permission(task);
--	mutex_unlock(&task->signal->cred_guard_mutex);
--
--	return mm;
--}
--
--struct mm_struct *mm_for_maps(struct task_struct *task)
-+static struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
- {
- 	struct mm_struct *mm;
- 	int err;
-@@ -263,7 +205,7 @@ struct mm_struct *mm_for_maps(struct tas
- 
- 	mm = get_task_mm(task);
- 	if (mm && mm != current->mm &&
--			!ptrace_may_access(task, PTRACE_MODE_READ)) {
-+            !ptrace_may_access(task, mode)) {
- 		mmput(mm);
- 		mm = ERR_PTR(-EACCES);
- 	}
-@@ -272,6 +214,11 @@ struct mm_struct *mm_for_maps(struct tas
- 	return mm;
- }
- 
-+struct mm_struct *mm_for_maps(struct task_struct *task)
-+{
-+   return mm_access(task, PTRACE_MODE_READ);
-+}
-+
- static int proc_pid_cmdline(struct task_struct *task, char * buffer)
- {
- 	int res = 0;
-@@ -816,38 +763,39 @@ static const struct file_operations proc
- 
- static int mem_open(struct inode* inode, struct file* file)
- {
--	file->private_data = (void*)((long)current->self_exec_id);
-+   struct task_struct *task = get_proc_task(file->f_path.dentry->d_inode);
-+   struct mm_struct *mm;
-+
-+   if (!task)
-+       return -ESRCH;
-+
-+   mm = mm_access(task, PTRACE_MODE_ATTACH);
-+   put_task_struct(task);
-+
-+   if (IS_ERR(mm))
-+       return PTR_ERR(mm);
-+
- 	/* OK to pass negative loff_t, we can catch out-of-range */
- 	file->f_mode |= FMODE_UNSIGNED_OFFSET;
-+    file->private_data = mm;
- 	return 0;
- }
- 
- static ssize_t mem_read(struct file * file, char __user * buf,
- 			size_t count, loff_t *ppos)
- {
--	struct task_struct *task = get_proc_task(file->f_path.dentry->d_inode);
-+    int ret;
- 	char *page;
- 	unsigned long src = *ppos;
--	int ret = -ESRCH;
--	struct mm_struct *mm;
-+    struct mm_struct *mm = file->private_data;
- 
--	if (!task)
--		goto out_no_task;
-+    if (!mm)
-+       return 0;
- 
- 	ret = -ENOMEM;
- 	page = (char *)__get_free_page(GFP_TEMPORARY);
- 	if (!page)
--		goto out;
--
--	mm = check_mem_permission(task);
--	ret = PTR_ERR(mm);
--	if (IS_ERR(mm))
--		goto out_free;
--
--	ret = -EIO;
-- 
--	if (file->private_data != (void*)((long)current->self_exec_id))
--		goto out_put;
-+        return -ENOMEM;
- 
- 	ret = 0;
-  
-@@ -874,13 +822,7 @@ static ssize_t mem_read(struct file * fi
- 	}
- 	*ppos = src;
- 
--out_put:
--	mmput(mm);
--out_free:
- 	free_page((unsigned long) page);
--out:
--	put_task_struct(task);
--out_no_task:
- 	return ret;
- }
- 
-@@ -889,27 +831,15 @@ static ssize_t mem_write(struct file * f
- {
- 	int copied;
- 	char *page;
--	struct task_struct *task = get_proc_task(file->f_path.dentry->d_inode);
- 	unsigned long dst = *ppos;
--	struct mm_struct *mm;
-+    struct mm_struct *mm = file->private_data;
- 
--	copied = -ESRCH;
--	if (!task)
--		goto out_no_task;
-+    if (!mm)
-+       return 0;
- 
--	copied = -ENOMEM;
- 	page = (char *)__get_free_page(GFP_TEMPORARY);
- 	if (!page)
--		goto out_task;
--
--	mm = check_mem_permission(task);
--	copied = PTR_ERR(mm);
--	if (IS_ERR(mm))
--		goto out_free;
--
--	copied = -EIO;
--	if (file->private_data != (void *)((long)current->self_exec_id))
--		goto out_mm;
-+        return -ENOMEM;
- 
- 	copied = 0;
- 	while (count > 0) {
-@@ -933,16 +863,18 @@ static ssize_t mem_write(struct file * f
- 	}
- 	*ppos = dst;
- 
--out_mm:
--	mmput(mm);
--out_free:
- 	free_page((unsigned long) page);
--out_task:
--	put_task_struct(task);
--out_no_task:
- 	return copied;
- }
- 
-+static int mem_release(struct inode *inode, struct file *file)
-+{
-+   struct mm_struct *mm = file->private_data;
-+
-+   mmput(mm);
-+   return 0;
-+}
-+
- loff_t mem_lseek(struct file *file, loff_t offset, int orig)
- {
- 	switch (orig) {
-@@ -964,6 +896,7 @@ static const struct file_operations proc
- 	.read		= mem_read,
- 	.write		= mem_write,
- 	.open		= mem_open,
-+    .release    = mem_release,
- };
- 
- static ssize_t environ_read(struct file *file, char __user *buf,