Fix broken procfs backport (rhbz 782961)
This commit is contained in:
		
							parent
							
								
									d4d7cd7818
								
							
						
					
					
						commit
						57fc038a5e
					
				| @ -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) | ||||
|  | ||||
| @ -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)
 | ||||
|  | ||||
| @ -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;
 | ||||
| +}
 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user