[kernel] r17606 - in dists/lenny-security/linux-2.6/debian/patches/features/all: openvz vserver
Dann Frazier
dannf at alioth.debian.org
Mon Jun 6 01:23:23 UTC 2011
Author: dannf
Date: Mon Jun 6 01:23:21 2011
New Revision: 17606
Log:
adjust to apply on top of fixes for CVE-2011-1593
Modified:
dists/lenny-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch
dists/lenny-security/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.35.patch
Modified: dists/lenny-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch
==============================================================================
--- dists/lenny-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch Mon Jun 6 01:21:31 2011 (r17605)
+++ dists/lenny-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch Mon Jun 6 01:23:21 2011 (r17606)
@@ -24981,7 +24981,7 @@
struct rcu_head rcu;
unsigned int level;
struct upid numbers[1];
-@@ -96,6 +99,11 @@ extern void change_pid(struct task_struct *task, enum pid_type,
+@@ -96,6 +99,11 @@ extern void change_pid(struct task_struc
struct pid *pid);
extern void transfer_pid(struct task_struct *old, struct task_struct *new,
enum pid_type);
@@ -24995,7 +24995,7 @@
extern struct pid_namespace init_pid_ns;
@@ -121,8 +129,11 @@ extern struct pid *find_get_pid(int nr);
extern struct pid *find_ge_pid(int nr, struct pid_namespace *);
- int next_pidmap(struct pid_namespace *pid_ns, int last);
+ int next_pidmap(struct pid_namespace *pid_ns, unsigned int last);
-extern struct pid *alloc_pid(struct pid_namespace *ns);
+extern struct pid *alloc_pid(struct pid_namespace *ns, pid_t vpid);
@@ -60287,7 +60287,7 @@
{
int i, offset, max_scan, pid, last = pid_ns->last_pid;
struct pidmap *map;
-@@ -181,6 +183,36 @@ static int alloc_pidmap(struct pid_namespace *pid_ns)
+@@ -181,6 +183,36 @@ static int alloc_pidmap(struct pid_names
return -1;
}
@@ -60321,7 +60321,7 @@
+ return pid;
+}
+
- int next_pidmap(struct pid_namespace *pid_ns, int last)
+ int next_pidmap(struct pid_namespace *pid_ns, unsigned int last)
{
int offset;
@@ -226,25 +258,33 @@ void free_pid(struct pid *pid)
Modified: dists/lenny-security/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.35.patch
==============================================================================
--- dists/lenny-security/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.35.patch Mon Jun 6 01:21:31 2011 (r17605)
+++ dists/lenny-security/linux-2.6/debian/patches/features/all/vserver/vs2.3.0.35.patch Mon Jun 6 01:23:21 2011 (r17606)
@@ -6985,14 +6985,14 @@
return proc_fill_cache(filp, dirent, filldir, name, len,
proc_pid_instantiate, iter.task, NULL);
}
-@@ -2706,7 +2723,7 @@ static int proc_pid_fill_cache(struct fi
- int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir)
- {
- unsigned int nr = filp->f_pos - FIRST_PROCESS_ENTRY;
-- struct task_struct *reaper = get_proc_task(filp->f_path.dentry->d_inode);
-+ struct task_struct *reaper = get_proc_task_real(filp->f_path.dentry->d_inode);
- struct tgid_iter iter;
- struct pid_namespace *ns;
+@@ -2715,7 +2732,7 @@ int proc_pid_readdir(struct file * filp,
+ goto out_no_task;
+ nr = filp->f_pos - FIRST_PROCESS_ENTRY;
+
+- reaper = get_proc_task(filp->f_path.dentry->d_inode);
++ reaper = get_proc_task_real(filp->f_path.dentry->d_inode);
+ if (!reaper)
+ goto out_no_task;
@@ -2726,6 +2743,8 @@ int proc_pid_readdir(struct file * filp,
iter.task;
More information about the Kernel-svn-changes
mailing list