proc 3/6: make /proc/net it's own filesystem (CVE-____-____)
Subsystems (3)
PATCH 1/1 proc 3/6: make /proc/net it's own filesystem (CVE-____-____)
Quoted 1 line
From
1b292cb4a9e028dc33f77c68bc21bff84a716abeMon Sep 17 00:00:00 2001
From: Eric W. Biederman <[email protected]>
Date: Tue, 31 Mar 2009 00:57:01 +0400
Subject: [PATCH 08/11] proc 3/6: make /proc/net it's own filesystem (CVE-____-____)
Make the VFS happy with /proc/net by making it it's own filesystem avoiding issues with hard links to directories and other silliness that confuse the vfs today.
We preserve backwards compatibility by automatically mounting /proc/self/net and marking it as a shrinkable mount so userspace doesn't need to care about it.
[This patch depends on459c19f524a9d89c65717a7d061d5f11ecf6bcb8 "SELinux: correctly detect proc filesystems of the form "proc/foo"" 12204e24b1330428c3062faee10a0d80b8a5cb61 "security: pass mount flags to security_sb_kern_mount()" 74192246910ff4fb95309ba1a683215644beeb62 "SELinux: don't check permissions for kernel mounts"
--adobriyan
]
--- fs/proc/base.c | 4 +- fs/proc/internal.h | 1 - fs/proc/proc_net.c | 198 ++++++++++++++++++++++++++++++------------- include/linux/magic.h | 1 + include/net/net_namespace.h | 1 + security/selinux/hooks.c | 29 +++++-- 6 files changed, 168 insertions(+), 66 deletions(-)
fs/proc/base.c +3 -1
@@ -126,6 +126,8 @@ struct pid_entry {NOD (NAME , (S_IFREG |(MODE )), \NULL , &proc_single_file_operations, \ { .proc_show = show } ) +#define MNT (NAME ,MODE , iops) \ + NOD(NAME, (S_IFDIR|(MODE)), &iops, NULL, {})/* * Count the number of hardlinks for the pid_entry table, excluding the .
@@ -2470,7 +2472,7 @@ static const struct pid_entry tgid_base_stuff[] = {DIR ("fd" ,S_IRUSR |S_IXUSR , proc_fd_inode_operations, proc_fd_operations),DIR ("fdinfo" ,S_IRUSR |S_IXUSR , proc_fdinfo_inode_operations, proc_fdinfo_operations), #ifdef CONFIG_NET -DIR ("net" ,S_IRUGO |S_IXUGO , proc_net_inode_operations, proc_net_operations), +MNT ("net" ,S_IRUGO |S_IXUGO , proc_net_inode_operations), #endifREG ("environ" ,S_IRUSR , proc_environ_operations), INF("auxv", S_IRUSR, proc_pid_auxv),
fs/proc/internal.h +0 -1
@@ -58,7 +58,6 @@ extern const struct file_operations proc_numa_maps_operations;extern const struct file_operations proc_smaps_operations;extern const struct file_operations proc_clear_refs_operations;extern const struct file_operations proc_pagemap_operations; -extern const struct file_operations proc_net_operations;extern const struct inode_operations proc_net_inode_operations;void free_proc_entry (struct proc_dir_entry *de);
fs/proc/proc_net.c +140 -58
256 lines not on this page · raw message
include/linux/magic.h +1 -0
@@ -33,6 +33,7 @@#define NFS_SUPER_MAGIC 0x6969#define OPENPROM_SUPER_MAGIC 0x9fa1#define PROC_SUPER_MAGIC 0x9fa0 +#define PROC_NET_SUPER_MAGIC 0x706e6574#define QNX4_SUPER_MAGIC 0x002f/* qnx4 fs detection */ #define REISERFS_SUPER_MAGIC 0x52654973/* used by gcc */
include/net/net_namespace.h +1 -0
@@ -41,6 +41,7 @@ struct net {struct proc_dir_entry *proc_net;struct proc_dir_entry *proc_net_stat; +struct vfsmount *proc_mnt;#ifdef CONFIG_SYSCTL struct ctl_table_set sysctls;
security/selinux/hooks.c +23 -6
@@ -713,7 +713,8 @@ static int selinux_set_mnt_opts(struct super_block *sb, goto out; } -if (strcmp (sb->s_type->name,"proc" ) ==0 ) +/* "proc", "proc/net" */ +if (strncmp (sb->s_type->name,"proc" ,4 ) ==0 ) sbsec->flags |=SE_SBPROC ;/* Determine the labeling behavior to use for this filesystem type. */
@@ -1174,16 +1175,18 @@ static inline u16 socket_type_to_security_class(int family, int type, int protoc }#ifdef CONFIG_PROC_FS -static int selinux_proc_get_sid (struct proc_dir_entry *de, +static int selinux_proc_get_sid (struct super_block *sb, +struct proc_dir_entry *de,u16 tclass,u32 *sid) {int buflen, rc;char *buffer, *path, *end; + rc = -ENOMEM ; buffer = (char *)__get_free_page (GFP_KERNEL );if (!buffer) -return -ENOMEM ; + goto out; buflen =PAGE_SIZE ; end = buffer+buflen;
@@ -1194,19 +1197,32 @@ static int selinux_proc_get_sid(struct proc_dir_entry *de,while (de && de != de->parent) { buflen -= de->namelen +1 ;if (buflen <0 ) -break ; + goto out_free; end -= de->namelen;memcpy (end, de->name, de->namelen); *--end ='/' ; path = end; de = de->parent; } +if (strcmp (sb->s_type->name,"proc" ) !=0 ) { +const char *name = sb->s_type->name +4 ; +int namelen =strlen (name); + buflen -= namelen; +if (buflen <0 ) + goto out_free; + end -= namelen; +memcpy (end, name, namelen); + path = end; + } rc =security_genfs_sid ("proc" , path, tclass, sid); +out_free:free_page ((unsigned long )buffer); +out: return rc; }#else -static int selinux_proc_get_sid (struct proc_dir_entry *de, +static int selinux_proc_get_sid (struct super_block *sb, +struct proc_dir_entry *de,u16 tclass,u32 *sid) {
@@ -1372,7 +1388,8 @@ static int inode_doinit_with_dentry(struct inode *inode, struct dentry *opt_dentstruct proc_inode *proci =PROC_I (inode);if (proci->pde) { isec->sclass =inode_mode_to_security_class (inode->i_mode); - rc =selinux_proc_get_sid (proci->pde, + rc =selinux_proc_get_sid (inode->i_sb, + proci->pde, isec->sclass, &sid);if (rc)
Signature · 1 line
1.5.6.5