rpms/kernel
8
2
Fork 6
Code Issues Pull Requests Releases Activity

Fix broken procfs backport (rhbz 782961)

Browse Source
This commit is contained in:
Josh Boyer 2012-01-18 20:00:25 -05:00
parent d4d7cd7818
commit 57fc038a5e
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel.spec
View File

@ -54,7 +54,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and # For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
# #
%global baserelease 7 %global baserelease 8
%global fedora_build %{baserelease} %global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching # base_sublevel is the kernel version we're starting with and patching
@ -2344,6 +2344,9 @@ fi
# ||----w | # ||----w |
# || || # || ||
%changelog %changelog
* Wed Jan 18 2012 Josh Boyer <jwboyer@redhat.com> 3.2.1-8
- Fix broken procfs backport (rhbz 782961)
* Wed Jan 18 2012 Josh Boyer <jwboyer@redhat.com> 3.2.1-7 * Wed Jan 18 2012 Josh Boyer <jwboyer@redhat.com> 3.2.1-7
- /proc/pid/* information leak (rhbz 782686) - /proc/pid/* information leak (rhbz 782686)
- CVE-2012-0056 proc: clean up and fix /proc/<pid>/mem (rhbz 782681) - CVE-2012-0056 proc: clean up and fix /proc/<pid>/mem (rhbz 782681)

4
procfs-add-hidepid-and-gid-mount-options.patch
View File

@ -262,9 +262,9 @@ index 27c762f..84fd323 100644
+++ b/fs/proc/inode.c +++ b/fs/proc/inode.c
@@ -106,6 +106,14 @@ void __init proc_init_inodecache(void) @@ -106,6 +106,14 @@ void __init proc_init_inodecache(void)
static int proc_show_options(struct seq_file *seq, struct dentry *root) static int proc_show_options(struct seq_file *seq, struct vfsmount *vfs)
{ {
+ struct super_block *sb = root->d_sb; + struct super_block *sb = vfs->mnt_sb;
+ struct pid_namespace *pid = sb->s_fs_info; + struct pid_namespace *pid = sb->s_fs_info;
+ +
+ if (pid->pid_gid) + if (pid->pid_gid)

2
procfs-parse-mount-options.patch
View File

@ -50,7 +50,7 @@ index 51a1766..27c762f 100644
init_once); init_once);
} }
+static int proc_show_options(struct seq_file *seq, struct dentry *root) +static int proc_show_options(struct seq_file *seq, struct vfsmount *vfs)
+{ +{
+ return 0; + return 0;
+} +}