Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
criu
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhul
criu
Commits
003e1532
Commit
003e1532
authored
Oct 14, 2011
by
Cyrill Gorcunov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kernel: Update patch series
Signed-off-by:
Cyrill Gorcunov
<
gorcunov@gmail.com
>
parent
bd2a541c
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
36 additions
and
28 deletions
+36
-28
binfmt-elf-for-cr-5
kernel/binfmt-elf-for-cr-5
+5
-2
cr-clone-with-pid-support
kernel/cr-clone-with-pid-support
+3
-2
fs-add-do-close
kernel/fs-add-do-close
+1
-1
fs-proc-add-tls
kernel/fs-proc-add-tls
+8
-4
proc-fix-races-against-execve-of-proc-pid-fd.patch
kernel/proc-fix-races-against-execve-of-proc-pid-fd.patch
+12
-12
procfs-report-eisdir-when-reading-sysctl-dirs-in-proc.patch
...ocfs-report-eisdir-when-reading-sysctl-dirs-in-proc.patch
+5
-5
series
kernel/series
+2
-2
No files found.
kernel/binfmt-elf-for-cr-5
View file @
003e1532
...
...
@@ -26,7 +26,7 @@ The later doesn't call for de_thread() allowing to keep threads
relationship. Also arch_setup_additional_pages_at() helper added
to setup vdso at predefined address.
At moment only x86-64 architecture is supported.
At moment only
pure
x86-64 architecture is supported.
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
CC: Andrew Vagin <avagin@parallels.com>
...
...
@@ -35,8 +35,11 @@ CC: James Bottomley <jbottomley@parallels.com>
CC: Glauber Costa <glommer@parallels.com>
CC: H. Peter Anvin <hpa@zytor.com>
CC: Ingo Molnar <mingo@elte.hu>
CC: Al Viro <viro@ZenIV.linux.org.uk>
CC: Tejun Heo <tj@kernel.org>
CC: Dave Hansen <dave@linux.vnet.ibm.com>
CC: Eric W. Biederman ebiederm@xmission.com
CC: Daniel Lezcano <dlezcano@fr.ibm.com>
CC: Alexey Dobriyan <adobriyan@gmail.com>
---
arch/x86/include/asm/elf.h | 3
arch/x86/include/asm/elf_ckpt.h | 80 ++++++++
...
...
kernel/cr-clone-with-pid-support
View file @
003e1532
clone: Introduce the CLONE_CHILD_USEPID functionality
From: Pavel Emelyanov <xemul@openvz.org>
Subject: [PATCH] clone: Introduce the CLONE_CHILD_USEPID functionality
When restoring a task (or a set of tasks) we need to recreate them with
exactly the same pid as they had before. Thus we need the ability to create
...
...
@@ -50,7 +51,7 @@ Index: linux-2.6.git/kernel/fork.c
===================================================================
--- linux-2.6.git.orig/kernel/fork.c
+++ linux-2.6.git/kernel/fork.c
@@ -12
39,8 +1239
,16 @@ static struct task_struct *copy_process(
@@ -12
53,8 +1253
,16 @@ static struct task_struct *copy_process(
goto bad_fork_cleanup_io;
if (pid != &init_struct_pid) {
...
...
kernel/fs-add-do-close
View file @
003e1532
...
...
@@ -75,7 +75,7 @@ Index: linux-2.6.git/include/linux/fs.h
===================================================================
--- linux-2.6.git.orig/include/linux/fs.h
+++ linux-2.6.git/include/linux/fs.h
@@ -202
7,6 +2027
,7 @@ extern struct file *file_open_root(struc
@@ -202
5,6 +2025
,7 @@ extern struct file *file_open_root(struc
extern struct file * dentry_open(struct dentry *, struct vfsmount *, int,
const struct cred *);
extern int filp_close(struct file *, fl_owner_t id);
...
...
kernel/fs-proc-add-tls
View file @
003e1532
...
...
@@ -6,17 +6,18 @@ information by /proc/$pid/tls entry.
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
---
fs/proc/base.c |
16
++++++++++++++++
1 file changed,
16
insertions(+)
fs/proc/base.c |
20 ++++
++++++++++++++++
1 file changed,
20
insertions(+)
Index: linux-2.6.git/fs/proc/base.c
===================================================================
--- linux-2.6.git.orig/fs/proc/base.c
+++ linux-2.6.git/fs/proc/base.c
@@ -3150,6 +3150,2
1
@@ static int proc_pid_personality(struct s
@@ -3150,6 +3150,2
3
@@ static int proc_pid_personality(struct s
return err;
}
+#ifdef CONFIG_X86
+static int proc_pid_tls(struct seq_file *m, struct pid_namespace *ns,
+ struct pid *pid, struct task_struct *task)
+{
...
...
@@ -31,15 +32,18 @@ Index: linux-2.6.git/fs/proc/base.c
+ }
+ return err;
+}
+#endif
+
/*
* Thread groups
*/
@@ -3169,6 +318
4,7
@@ static const struct pid_entry tgid_base_
@@ -3169,6 +318
6,9
@@ static const struct pid_entry tgid_base_
INF("auxv", S_IRUSR, proc_pid_auxv),
ONE("status", S_IRUGO, proc_pid_status),
ONE("personality", S_IRUGO, proc_pid_personality),
+#ifdef CONFIG_X86
+ ONE("tls", S_IRUGO, proc_pid_tls),
+#endif
INF("limits", S_IRUGO, proc_pid_limits),
#ifdef CONFIG_SCHED_DEBUG
REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
kernel/proc-fix-races-against-execve-of-proc-pid-fd.patch
View file @
003e1532
...
...
@@ -26,13 +26,14 @@ Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
fs/proc/base.c | 146 +++++++++++++++++++++++++++++++++--------------
fs/proc/base.c | 146 +++++++++++++++++++++++++++++++++
+++++++---
--------------
1 file changed, 103 insertions(+), 43 deletions(-)
diff -puN fs/proc/base.c~proc-fix-races-against-execve-of-proc-pid-fd fs/proc/base.c
--- a/fs/proc/base.c~proc-fix-races-against-execve-of-proc-pid-fd
+++ a/fs/proc/base.c
@@ -1652,12 +1652,46 @@ out:
Index: linux-2.6.git/fs/proc/base.c
===================================================================
--- linux-2.6.git.orig/fs/proc/base.c
+++ linux-2.6.git/fs/proc/base.c
@@ -1665,12 +1665,46 @@ out:
return error;
}
...
...
@@ -79,7 +80,7 @@ diff -puN fs/proc/base.c~proc-fix-races-against-execve-of-proc-pid-fd fs/proc/ba
/* building an inode */
@@ -1
889,49 +1923
,61 @@ out:
@@ -1
902,49 +1936
,61 @@ out:
static int proc_fd_info(struct inode *inode, struct path *path, char *info)
{
...
...
@@ -180,7 +181,7 @@ diff -puN fs/proc/base.c~proc-fix-races-against-execve-of-proc-pid-fd fs/proc/ba
}
static int proc_fd_link(struct inode *inode, struct path *path)
@@ -20
26,7 +2072
,7 @@ static struct dentry *proc_fd_instantiat
@@ -20
39,7 +2085
,7 @@ static struct dentry *proc_fd_instantiat
spin_unlock(&files->file_lock);
put_files_struct(files);
...
...
@@ -189,7 +190,7 @@ diff -puN fs/proc/base.c~proc-fix-races-against-execve-of-proc-pid-fd fs/proc/ba
inode->i_size = 64;
ei->op.proc_get_link = proc_fd_link;
d_set_d_op(dentry, &tid_fd_dentry_operations);
@@ -20
58,7 +2104
,12 @@ static struct dentry *proc_lookupfd_comm
@@ -20
71,7 +2117
,12 @@ static struct dentry *proc_lookupfd_comm
if (fd == ~0U)
goto out;
...
...
@@ -202,7 +203,7 @@ diff -puN fs/proc/base.c~proc-fix-races-against-execve-of-proc-pid-fd fs/proc/ba
out:
put_task_struct(task);
out_no_task:
@@ -20
78,23 +2129
,28 @@ static int proc_readfd_common(struct fil
@@ -20
91,23 +2142
,28 @@ static int proc_readfd_common(struct fil
retval = -ENOENT;
if (!p)
goto out_no_task;
...
...
@@ -234,7 +235,7 @@ diff -puN fs/proc/base.c~proc-fix-races-against-execve-of-proc-pid-fd fs/proc/ba
rcu_read_lock();
for (fd = filp->f_pos-2;
fd < files_fdtable(files)->max_fds;
@@ -21
18,6 +2174
,9 @@ static int proc_readfd_common(struct fil
@@ -21
31,6 +2187
,9 @@ static int proc_readfd_common(struct fil
rcu_read_unlock();
put_files_struct(files);
}
...
...
@@ -244,7 +245,7 @@ diff -puN fs/proc/base.c~proc-fix-races-against-execve-of-proc-pid-fd fs/proc/ba
out:
put_task_struct(p);
out_no_task:
@@ -2
195,6 +2254
,7 @@ static struct dentry *proc_fdinfo_instan
@@ -2
208,6 +2267
,7 @@ static struct dentry *proc_fdinfo_instan
ei->fd = fd;
inode->i_mode = S_IFREG | S_IRUSR;
inode->i_fop = &proc_fdinfo_file_operations;
...
...
@@ -252,4 +253,3 @@ diff -puN fs/proc/base.c~proc-fix-races-against-execve-of-proc-pid-fd fs/proc/ba
d_set_d_op(dentry, &tid_fd_dentry_operations);
d_add(dentry, inode);
/* Close the race of the process dying before we return the dentry */
_
kernel/procfs-report-eisdir-when-reading-sysctl-dirs-in-proc.patch
View file @
003e1532
...
...
@@ -12,10 +12,11 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
fs/proc/proc_sysctl.c | 1 +
1 file changed, 1 insertion(+)
diff -puN fs/proc/proc_sysctl.c~procfs-report-eisdir-when-reading-sysctl-dirs-in-proc fs/proc/proc_sysctl.c
--- a/fs/proc/proc_sysctl.c~procfs-report-eisdir-when-reading-sysctl-dirs-in-proc
+++ a/fs/proc/proc_sysctl.c
@@ -360,6 +360,7 @@ static const struct file_operations proc
Index: linux-2.6.git/fs/proc/proc_sysctl.c
===================================================================
--- linux-2.6.git.orig/fs/proc/proc_sysctl.c
+++ linux-2.6.git/fs/proc/proc_sysctl.c
@@ -370,6 +370,7 @@ static const struct file_operations proc
};
static const struct file_operations proc_sys_dir_file_operations = {
...
...
@@ -23,4 +24,3 @@ diff -puN fs/proc/proc_sysctl.c~procfs-report-eisdir-when-reading-sysctl-dirs-in
.readdir = proc_sys_readdir,
.llseek = generic_file_llseek,
};
_
kernel/series
View file @
003e1532
cr-proc-add-children
procfs-report-eisdir-when-reading-sysctl-dirs-in-proc.patch
proc-fix-races-against-execve-of-proc-pid-fd.patch
proc-fix-races-against-execve-of-proc-pid-fd-fix.patch
proc-force-dcache-drop-on-unauthorized-access.patch
cr-statfs-callback-for-pipefs
cr-clone-with-pid-support
cr-proc-add-children
fs-add-do-close
fs-proc-switch-to-dentry
cr-proc-map-files-21
fs-proc-add-tls
fs-add-do-close
fs-proc-add-mm-task-stat
binfmt-elf-for-cr-5
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment