diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2012-01-18 20:00:25 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2012-01-18 20:54:46 -0500 |
| commit | 57fc038a5eefa58ea958af5d7ce4be0c21bdb3fb (patch) | |
| tree | 9fdc5f5c42e20d9b044a992ce517b7d9657d0401 | |
| parent | d4d7cd7818244e55ad5f1c0ce3d56e6d73a183e7 (diff) | |
Fix broken procfs backport (rhbz 782961)
| -rw-r--r-- | kernel.spec | 5 | ||||
| -rw-r--r-- | procfs-add-hidepid-and-gid-mount-options.patch | 4 | ||||
| -rw-r--r-- | procfs-parse-mount-options.patch | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec index 5523f6d7..523f7d0c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -54,7 +54,7 @@ Summary: The Linux kernel # 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" # -%global baserelease 7 +%global baserelease 8 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -2344,6 +2344,9 @@ fi # ||----w | # || || %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 - /proc/pid/* information leak (rhbz 782686) - CVE-2012-0056 proc: clean up and fix /proc/<pid>/mem (rhbz 782681) diff --git a/procfs-add-hidepid-and-gid-mount-options.patch b/procfs-add-hidepid-and-gid-mount-options.patch index 24156b0d..803f77d4 100644 --- a/procfs-add-hidepid-and-gid-mount-options.patch +++ b/procfs-add-hidepid-and-gid-mount-options.patch @@ -262,9 +262,9 @@ index 27c762f..84fd323 100644 +++ b/fs/proc/inode.c @@ -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; + + if (pid->pid_gid) diff --git a/procfs-parse-mount-options.patch b/procfs-parse-mount-options.patch index 99684c4b..0187a1d4 100644 --- a/procfs-parse-mount-options.patch +++ b/procfs-parse-mount-options.patch @@ -50,7 +50,7 @@ index 51a1766..27c762f 100644 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; +} |